From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml |  225 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 121 insertions(+), 104 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml
index 73e34c0..e6c66f0 100644
--- a/java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml
@@ -5,129 +5,146 @@
 <mapper namespace="oaWorkflowServiceDaoImpl">
 
 
-
-
-
     <!-- 淇濆瓨OA宸ヤ綔娴佷俊鎭� add by wuxw 2018-07-03 -->
     <insert id="saveOaWorkflowInfo" parameterType="Map">
         insert into oa_workflow(
-describle,model_id,flow_key,store_id,flow_id,flow_name,flow_type,process_definition_key
-) values (
-#{describle},#{modelId},#{flowKey},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey}
-)
+        describle,model_id,flow_key,store_id,flow_id,flow_name,flow_type,process_definition_key,state
+        ) values (
+        #{describle},#{modelId},#{flowKey},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey},#{state}
+        )
     </insert>
-
 
 
     <!-- 鏌ヨOA宸ヤ綔娴佷俊鎭� add by wuxw 2018-07-03 -->
     <select id="getOaWorkflowInfo" parameterType="Map" resultType="Map">
-        select  t.describle,t.model_id,t.model_id modelId,t.status_cd,t.status_cd statusCd,t.flow_key,t.flow_key flowKey,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name flowName,t.flow_type,t.flow_type flowType,t.process_definition_key,t.process_definition_key processDefinitionKey 
-from oa_workflow t 
-where 1 =1 
-<if test="describle !=null and describle != ''">
-   and t.describle= #{describle}
-</if> 
-<if test="modelId !=null and modelId != ''">
-   and t.model_id= #{modelId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="flowKey !=null and flowKey != ''">
-   and t.flow_key= #{flowKey}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="flowId !=null and flowId != ''">
-   and t.flow_id= #{flowId}
-</if> 
-<if test="flowName !=null and flowName != ''">
-   and t.flow_name= #{flowName}
-</if> 
-<if test="flowType !=null and flowType != ''">
-   and t.flow_type= #{flowType}
-</if> 
-<if test="processDefinitionKey !=null and processDefinitionKey != ''">
-   and t.process_definition_key= #{processDefinitionKey}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.describle,t.model_id,t.model_id modelId,t.status_cd,t.status_cd statusCd,t.flow_key,t.flow_key
+        flowKey,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
+        flowName,t.flow_type,t.flow_type flowType,t.process_definition_key,t.process_definition_key processDefinitionKey,
+        t.create_time createTime,t.state,t.cur_form_id curFormId
+        from oa_workflow t
+        where 1 =1
+        <if test="describle !=null and describle != ''">
+            and t.describle= #{describle}
+        </if>
+        <if test="modelId !=null and modelId != ''">
+            and t.model_id= #{modelId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="flowKey !=null and flowKey != ''">
+            and t.flow_key= #{flowKey}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="flowName !=null and flowName != ''">
+            and t.flow_name= #{flowName}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            and t.flow_type= #{flowType}
+        </if>
+        <if test="curFormId !=null and curFormId != ''">
+            and t.cur_form_id= #{curFormId}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            and t.process_definition_key= #{processDefinitionKey}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 淇敼OA宸ヤ綔娴佷俊鎭� add by wuxw 2018-07-03 -->
     <update id="updateOaWorkflowInfo" parameterType="Map">
-        update  oa_workflow t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="describle !=null and describle != ''">
-, t.describle= #{describle}
-</if> 
-<if test="modelId !=null and modelId != ''">
-, t.model_id= #{modelId}
-</if> 
-<if test="flowKey !=null and flowKey != ''">
-, t.flow_key= #{flowKey}
-</if> 
-<if test="storeId !=null and storeId != ''">
-, t.store_id= #{storeId}
-</if> 
-<if test="flowName !=null and flowName != ''">
-, t.flow_name= #{flowName}
-</if> 
-<if test="flowType !=null and flowType != ''">
-, t.flow_type= #{flowType}
-</if> 
-<if test="processDefinitionKey !=null and processDefinitionKey != ''">
-, t.process_definition_key= #{processDefinitionKey}
-</if> 
- where 1=1 <if test="flowId !=null and flowId != ''">
-and t.flow_id= #{flowId}
-</if> 
+        update oa_workflow t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="describle !=null and describle != ''">
+            , t.describle= #{describle}
+        </if>
+        <if test="modelId !=null and modelId != ''">
+            , t.model_id= #{modelId}
+        </if>
+        <if test="flowKey !=null and flowKey != ''">
+            , t.flow_key= #{flowKey}
+        </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
+
+        <if test="flowName !=null and flowName != ''">
+            , t.flow_name= #{flowName}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            , t.flow_type= #{flowType}
+        </if>
+        <if test="curFormId !=null and curFormId != ''">
+            , t.cur_form_id= #{curFormId}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            , t.process_definition_key= #{processDefinitionKey}
+        </if>
+        where 1=1
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
 
     </update>
 
     <!-- 鏌ヨOA宸ヤ綔娴佹暟閲� add by wuxw 2018-07-03 -->
-     <select id="queryOaWorkflowsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from oa_workflow t 
-where 1 =1 
-<if test="describle !=null and describle != ''">
-   and t.describle= #{describle}
-</if> 
-<if test="modelId !=null and modelId != ''">
-   and t.model_id= #{modelId}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="flowKey !=null and flowKey != ''">
-   and t.flow_key= #{flowKey}
-</if> 
-<if test="storeId !=null and storeId != ''">
-   and t.store_id= #{storeId}
-</if> 
-<if test="flowId !=null and flowId != ''">
-   and t.flow_id= #{flowId}
-</if> 
-<if test="flowName !=null and flowName != ''">
-   and t.flow_name= #{flowName}
-</if> 
-<if test="flowType !=null and flowType != ''">
-   and t.flow_type= #{flowType}
-</if> 
-<if test="processDefinitionKey !=null and processDefinitionKey != ''">
-   and t.process_definition_key= #{processDefinitionKey}
-</if> 
+    <select id="queryOaWorkflowsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from oa_workflow t
+        where 1 =1
+        <if test="describle !=null and describle != ''">
+            and t.describle= #{describle}
+        </if>
+        <if test="modelId !=null and modelId != ''">
+            and t.model_id= #{modelId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="flowKey !=null and flowKey != ''">
+            and t.flow_key= #{flowKey}
+        </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
+        <if test="flowId !=null and flowId != ''">
+            and t.flow_id= #{flowId}
+        </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="flowName !=null and flowName != ''">
+            and t.flow_name= #{flowName}
+        </if>
+        <if test="flowType !=null and flowType != ''">
+            and t.flow_type= #{flowType}
+        </if>
+        <if test="curFormId !=null and curFormId != ''">
+            and t.cur_form_id= #{curFormId}
+        </if>
+        <if test="processDefinitionKey !=null and processDefinitionKey != ''">
+            and t.process_definition_key= #{processDefinitionKey}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

--
Gitblit v1.8.0