From 38d7bffeb4d445f7719b0dc76bb17f3c8a99560d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 七月 2020 17:57:54 +0800
Subject: [PATCH] 优化完成物品采购

---
 java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml |   20 ++++++++++++++------
 1 files changed, 14 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
index 3e98a1e..19a8962 100644
--- 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
         ) values (
-        #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId}
+        #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId},#{staffRole}
         )
     </insert>
 
@@ -17,7 +17,8 @@
     <!-- 鏌ヨ宸ヤ綔娴佽妭鐐逛俊鎭紙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
         from business_workflow_step_staff t
         where 1 =1
         <if test="wssId !=null and wssId != ''">
@@ -48,8 +49,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
+        ) select t.wss_id,t.step_id,t.staff_name,'0',t.b_id,t.community_id,t.staff_id,t.staff_role
+        from business_workflow_step_staff
         t where 1=1
         <if test="wssId !=null and wssId != ''">
             and t.wss_id= #{wssId}
@@ -78,7 +80,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
         from workflow_step_staff t
         where 1 =1
         <if test="wssId !=null and wssId != ''">
@@ -101,6 +103,9 @@
         </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>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
@@ -128,6 +133,9 @@
         <if test="staffId !=null and staffId != ''">
             , t.staff_id= #{staffId}
         </if>
+        <if test="staffRole !=null and staffRole != ''">
+            , t.staff_role= #{staffRole}
+        </if>
         where 1=1
         <if test="wssId !=null and wssId != ''">
             and t.wss_id= #{wssId}

--
Gitblit v1.8.0