From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml |   88 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 85 insertions(+), 3 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml
index cc12679..bd1952d 100644
--- a/java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml
@@ -56,9 +56,7 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="formId !=null and formId != ''">
-            , t.form_id= #{formId}
-        </if>
+
         <if test="formJson !=null and formJson != ''">
             , t.form_json= #{formJson}
         </if>
@@ -75,6 +73,8 @@
             , t.table_name= #{tableName}
         </if>
         where 1=1
+        and t.form_id= #{formId}
+
     </update>
 
     <!-- 鏌ヨOA琛ㄥ崟鏁伴噺 add by wuxw 2018-07-03 -->
@@ -117,5 +117,87 @@
     </update>
 
 
+    <!-- 鏌ヨOA琛ㄥ崟鏁伴噺 add by wuxw 2018-07-03 -->
+    <select id="queryOaWorkflowFormDataCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from ${tableName} t
+        where 1 =1
+        and t.store_id = #{storeId}
+        and t.status_cd= '0'
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
+        <if test="id !=null and id != ''">
+            and t.id = #{id}
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name = #{createUserName}
+        </if>
+    </select>
+
+    <!-- 鏌ヨOA琛ㄥ崟鏁伴噺 add by wuxw 2018-07-03 -->
+    <select id="queryOaWorkflowFormDatas" parameterType="Map" resultType="Map">
+        select t.*
+        from ${tableName} t
+        where 1 =1
+        and t.store_id = #{storeId}
+        and t.status_cd= '0'
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt; #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt; #{endTime}
+        </if>
+        <if test="id !=null and id != ''">
+            and t.id = #{id}
+        </if>
+        <if test="ids != null">
+            and t.id in
+            <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="createUserName !=null and createUserName != ''">
+            and t.create_user_name = #{createUserName}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
+    </select>
+
+    <!-- 淇濆瓨琛ㄥ崟鏁版嵁 -->
+    <insert id="saveOaWorkflowFormDataInfo" parameterType="Map">
+        insert into ${tableName} (
+        <foreach collection="columns" item="item" separator=",">
+            ${item}
+        </foreach>
+        ,id,create_user_id,create_user_name,state,store_id
+        )values(
+        <foreach collection="values" item="valueItem" separator=",">
+            #{valueItem}
+        </foreach>
+        ,#{id},#{createUserId},#{createUserName},#{state},#{storeId}
+        )
+    </insert>
+
+    <!-- 淇敼淇℃伅 -->
+    <update id="updateOaWorkflowFormData" parameterType="Map">
+        update ${tableName} t set t.state = #{state}
+        where t.id = #{id}
+    </update>
+
+    <!-- 淇敼淇℃伅 -->
+    <update id="updateOaWorkflowFormDataAll" parameterType="Map">
+        update ${tableName} set
+            <foreach collection="columns" item="item" separator=",">
+                ${item}
+            </foreach>
+        where id = #{id}
+    </update>
+
 
 </mapper>

--
Gitblit v1.8.0