From 9b0f6f5a7b520548c3985ec561dd02c8e960b47a Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Tue, 20 Feb 2024 12:04:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/datasource/eightwork/HotWorkMapper.xml        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
index b6e83ff..570c558 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
@@ -558,6 +558,7 @@
             log.ACT_TIME,
             log.STATUS,
             cu.SIGN_USER,
+            cu.FINISHED_SIGN_USER,
             cu.STEP_ID as CURRENT_STEP
         from
             bus_eightwork_task_flow flow
@@ -565,9 +566,12 @@
         left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
             log.WORK_ID = #{HOTWORK_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_hotwork_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_hotwork_sign sign
             left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.HOTWORK_ID = #{HOTWORK_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