From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 3e98a1e..983fd65
--- a/java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨宸ヤ綔娴佽妭鐐逛俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessWorkflowStepStaffInfo" parameterType="Map">
insert into business_workflow_step_staff(
- wss_id,operate,step_id,staff_name,b_id,community_id,staff_id
+ wss_id,operate,step_id,staff_name,b_id,community_id,staff_id,staff_role,flow_type
) values (
- #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId}
+ #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId},#{staffRole},#{flowType}
)
</insert>
@@ -17,7 +17,9 @@
<!-- 鏌ヨ宸ヤ綔娴佽妭鐐逛俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessWorkflowStepStaffInfo" parameterType="Map" resultType="Map">
select t.wss_id,t.wss_id wssId,t.operate,t.step_id,t.step_id stepId,t.staff_name,t.staff_name
- staffName,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId
+ staffName,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id
+ staffId,t.staff_role,
+ t.staff_role staffRole,t.flow_type,t.flow_type flowType
from business_workflow_step_staff t
where 1 =1
<if test="wssId !=null and wssId != ''">
@@ -48,8 +50,9 @@
<!-- 淇濆瓨宸ヤ綔娴佽妭鐐逛俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveWorkflowStepStaffInfoInstance" parameterType="Map">
insert into workflow_step_staff(
- wss_id,step_id,staff_name,status_cd,b_id,community_id,staff_id
- ) select t.wss_id,t.step_id,t.staff_name,'0',t.b_id,t.community_id,t.staff_id from business_workflow_step_staff
+ wss_id,step_id,staff_name,status_cd,b_id,community_id,staff_id,staff_role,flow_type
+ ) select t.wss_id,t.step_id,t.staff_name,'0',t.b_id,t.community_id,t.staff_id,t.staff_role,t.flow_type
+ from business_workflow_step_staff
t where 1=1
<if test="wssId !=null and wssId != ''">
and t.wss_id= #{wssId}
@@ -78,7 +81,7 @@
<select id="getWorkflowStepStaffInfo" parameterType="Map" resultType="Map">
select t.wss_id,t.wss_id wssId,t.step_id,t.step_id stepId,t.staff_name,t.staff_name
staffName,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id
- communityId,t.staff_id,t.staff_id staffId
+ communityId,t.staff_id,t.staff_id staffId,t.staff_role,t.staff_role staffRole,t.flow_type,t.flow_type flowType
from workflow_step_staff t
where 1 =1
<if test="wssId !=null and wssId != ''">
@@ -101,6 +104,18 @@
</if>
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
+ </if>
+ <if test="staffRole !=null and staffRole != ''">
+ and t.staff_role= #{staffRole}
+ </if>
+ <if test="flowType !=null and flowType != ''">
+ and t.flow_type= #{flowType}
+ </if>
+ <if test="flowTypes !=null and flowTypes != ''">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -127,6 +142,12 @@
</if>
<if test="staffId !=null and staffId != ''">
, t.staff_id= #{staffId}
+ </if>
+ <if test="staffRole !=null and staffRole != ''">
+ , t.staff_role= #{staffRole}
+ </if>
+ <if test="flowType !=null and flowType != ''">
+ , t.flow_type= #{flowType}
</if>
where 1=1
<if test="wssId !=null and wssId != ''">
@@ -164,6 +185,15 @@
<if test="staffId !=null and staffId != ''">
and t.staff_id= #{staffId}
</if>
+ <if test="flowType !=null and flowType != ''">
+ and t.flow_type= #{flowType}
+ </if>
+ <if test="flowTypes !=null and flowTypes != ''">
+ and t.flow_type in
+ <foreach collection="flowTypes" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</select>
--
Gitblit v1.8.0