From 29f9cbcfcac82bd6291c25fbdc3c74b2a5dd4359 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Wed, 21 Feb 2024 10:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AB=E9=A1=B9=E4=BD=9C=E4=B8=9A=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/eightwork/ConfinedspaceMapper.xml       | 10 ++++++++--
 .../mybatis/datasource/eightwork/HighWorkMapper.xml    | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
index f27a9e3..b7428e1 100644
--- a/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
@@ -462,11 +462,14 @@
 
     <select id="getFlowList" resultType="pd">
         select
+            flow.CAN_SKIP,
+            flow.ACTOR_FIELD,
             step.STEP_NAME,
             user.NAME as ACT_USER_NAME,
             log.ACT_TIME,
             log.STATUS,
             cu.SIGN_USER,
+            cu.FINISHED_SIGN_USER,
             cu.STEP_ID as CURRENT_STEP
         from
             bus_eightwork_task_flow flow
@@ -474,9 +477,12 @@
         left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
             log.WORK_ID = #{CONFINEDSPACE_ID}
         left join sys_user user on user.USER_ID = log.ACT_USER
-        left join (select sign.STEP_ID,GROUP_CONCAT(signer.NAME) sign_user from bus_confinedspace_sign sign
+        left join (select sign.STEP_ID,
+            GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
+            GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
+            from bus_confinedspace_sign sign
             left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
-            and sign.SIGN_TIME is null) cu on cu.STEP_ID = step.STEP_ID
+            GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
         where
             flow.TASK_ID = #{TASK_ID}
         and
diff --git a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
index a974fe9..f4bc026 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
@@ -445,11 +445,14 @@
 
     <select id="getFlowList" resultType="pd">
         select
+            flow.CAN_SKIP,
+            flow.ACTOR_FIELD,
             step.STEP_NAME,
             user.NAME as ACT_USER_NAME,
             log.ACT_TIME,
             log.STATUS,
             cu.SIGN_USER,
+            cu.FINISHED_SIGN_USER,
             cu.STEP_ID as CURRENT_STEP
         from
             bus_eightwork_task_flow flow
@@ -457,9 +460,12 @@
         left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
             log.WORK_ID = #{HIGHWORK_ID}
         left join sys_user user on user.USER_ID = log.ACT_USER
-        left join (select sign.STEP_ID,GROUP_CONCAT(signer.NAME) sign_user from bus_highwork_sign sign
+        left join (select sign.STEP_ID,
+            GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
+            GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
+            from bus_highwork_sign sign
             left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.HIGHWORK_ID = #{HIGHWORK_ID}
-            and sign.SIGN_TIME is null) cu on cu.STEP_ID = step.STEP_ID
+            GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
         where
             flow.TASK_ID = #{TASK_ID}
         and