From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-dms/jnpf-dms-biz/src/main/resources/mapper/DmsWenjianXiudingShenheMapper.xml |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 48 insertions(+), 0 deletions(-)

diff --git a/jnpf-dms/jnpf-dms-biz/src/main/resources/mapper/DmsWenjianXiudingShenheMapper.xml b/jnpf-dms/jnpf-dms-biz/src/main/resources/mapper/DmsWenjianXiudingShenheMapper.xml
new file mode 100644
index 0000000..55b535b
--- /dev/null
+++ b/jnpf-dms/jnpf-dms-biz/src/main/resources/mapper/DmsWenjianXiudingShenheMapper.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="jnpf.dmsMapper.DmsWenjianXiudingShenheMapper">
+
+    <resultMap id="BaseResultMap" type="jnpf.dmsEntity.DmsWenjianXiudingShenheEntity">
+        <id column="f_id" property="id"/>
+        <result column="f_tenant_id" property="tenantId"/>
+        <result column="f_flow_id" property="flowId"/>
+        <result column="f_flow_task_id" property="flowTaskId"/>
+        <result column="f_flow_state" property="flowState"/>
+        <result column="f_delete_mark" property="deleteMark"/>
+        <result column="xiuding_shenqing_id" property="xiudingShenqingId"/>
+        <result column="biangeng_fangshi" property="biangengFangshi"/>
+        <result column="shengxiao_banben_xuhao" property="shengxiaoBanbenXuhao"/>
+        <result column="shengxiao_banbenhao" property="shengxiaoBanbenhao"/>
+        <result column="shengxiao_biangeng_xuhao" property="shengxiaoBiangengXuhao"/>
+        <result column="banben_shengxiao_shijian" property="banbenShengxiaoShijian"/>
+    </resultMap>
+
+    <select id="selectByFlowForUpdate" resultMap="BaseResultMap">
+        SELECT f_id, f_tenant_id, f_flow_id, f_flow_task_id, f_flow_state,
+               f_delete_mark, xiuding_shenqing_id, biangeng_fangshi,
+               shengxiao_banben_xuhao, shengxiao_banbenhao,
+               shengxiao_biangeng_xuhao, banben_shengxiao_shijian
+        FROM dms_wenjian_xiuding_shenhe
+        WHERE f_tenant_id = #{tenantId}
+          AND f_flow_id = #{flowId}
+          AND f_flow_task_id = #{taskId}
+          AND (f_delete_mark IS NULL OR f_delete_mark &lt;&gt; 1)
+        FOR UPDATE
+    </select>
+
+    <update id="updateEffectiveVersion">
+        UPDATE dms_wenjian_xiuding_shenhe
+        SET shengxiao_banben_xuhao = #{shengxiaoBanbenXuhao},
+            shengxiao_banbenhao = #{shengxiaoBanbenhao},
+            shengxiao_biangeng_xuhao = #{shengxiaoBiangengXuhao},
+            banben_shengxiao_shijian = #{banbenShengxiaoShijian}
+        WHERE f_id = #{id}
+          AND f_tenant_id = #{tenantId}
+          AND shengxiao_banben_xuhao IS NULL
+          AND shengxiao_banbenhao IS NULL
+          AND shengxiao_biangeng_xuhao IS NULL
+          AND banben_shengxiao_shijian IS NULL
+          AND (f_delete_mark IS NULL OR f_delete_mark &lt;&gt; 1)
+    </update>
+
+</mapper>

--
Gitblit v1.8.0