From 3507bf61a974b76773171eaf644fc4e7b53e0a7c Mon Sep 17 00:00:00 2001
From: chenxinying <1039655633@qq.com>
Date: Mon, 22 Jan 2024 14:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E6=B7=BB=E5=8A=A0=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=BC=80=E5=A7=8B=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/eightwork/HotWorkMapper.xml    | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
index fff7c96..c771bdb 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
@@ -49,7 +49,11 @@
         f.MONITOR_USER_ID,
         f.ACCEPT_DEPARTMENT_ID,
         f.ACCEPT_USER_ID,
-        f.ANALYZE_TIME
+        f.ANALYZE_TIME,
+        f.WORK_START_DEPARTMENT_ID,
+        f.WORK_START_USER_ID,
+        f.WORK_END_DEPARTMENT_ID,
+        f.WORK_END_USER_ID
     </sql>
 
     <!-- 字段用于新增 -->
@@ -95,7 +99,11 @@
         MONITOR_USER_ID,
         ACCEPT_DEPARTMENT_ID,
         ACCEPT_USER_ID,
-        ANALYZE_TIME
+        ANALYZE_TIME,
+        WORK_START_DEPARTMENT_ID,
+        WORK_START_USER_ID,
+        WORK_END_DEPARTMENT_ID,
+        WORK_END_USER_ID
     </sql>
 
     <!-- 字段值 -->
@@ -141,7 +149,11 @@
         #{MONITOR_USER_ID},
         #{ACCEPT_DEPARTMENT_ID},
         #{ACCEPT_USER_ID},
-        #{ANALYZE_TIME}
+        #{ANALYZE_TIME},
+        #{WORK_START_DEPARTMENT_ID},
+        #{WORK_START_USER_ID},
+        #{WORK_END_DEPARTMENT_ID},
+        #{WORK_END_USER_ID}
     </sql>
 
     <!-- 获取编码 -->
@@ -216,7 +228,11 @@
             MONITOR_USER_ID = #{MONITOR_USER_ID},
             ACCEPT_DEPARTMENT_ID = #{ACCEPT_DEPARTMENT_ID},
             ACCEPT_USER_ID = #{ACCEPT_USER_ID},
-            ANALYZE_TIME=#{ANALYZE_TIME}
+            ANALYZE_TIME=#{ANALYZE_TIME},
+            WORK_START_DEPARTMENT_ID=#{WORK_START_DEPARTMENT_ID},
+            WORK_START_USER_ID=#{WORK_START_USER_ID},
+            WORK_END_DEPARTMENT_ID=#{WORK_END_DEPARTMENT_ID},
+            WORK_END_USER_ID=#{WORK_END_USER_ID}
         where
             HOTWORK_ID = #{HOTWORK_ID}
     </update>
@@ -264,6 +280,10 @@
             monu.`NAME` as MONITOR_USER_NAME,
             acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
             acceu.`NAME` as ACCEPT_USER_NAME,
+            stao.`NAME` as WORK_START_DEPARTMENT_NAME,
+            stau.`NAME` as WORK_START_USER_NAME,
+            endo.`NAME` as WORK_END_DEPARTMENT_NAME,
+            endu.`NAME` as WORK_END_USER_NAME,
             f.ANALYZE_TIME
         FROM
             bus_hotwork AS f
@@ -299,6 +319,12 @@
 
             left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
             left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
+
+            left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
+            left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
+
+            left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
+            left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
         WHERE f.HOTWORK_ID = #{HOTWORK_ID}
     </select>
 
@@ -338,6 +364,10 @@
         monu.`NAME` as MONITOR_USER_NAME,
         acceo.`NAME` as ACCEPT_DEPARTMENT_NAME,
         acceu.`NAME` as ACCEPT_USER_NAME,
+        stao.`NAME` as WORK_START_DEPARTMENT_NAME,
+        stau.`NAME` as WORK_START_USER_NAME,
+        endo.`NAME` as WORK_END_DEPARTMENT_NAME,
+        endu.`NAME` as WORK_END_USER_NAME,
         log.STEP_NAME,
         log.NEXT_STEP_NAME,
         log.STATUS
@@ -376,6 +406,12 @@
         left join oa_department as acceo on f.ACCEPT_DEPARTMENT_ID = acceo.DEPARTMENT_ID
         left join sys_user as acceu on f.ACCEPT_USER_ID = acceu.USER_ID
 
+        left join oa_department as stao on f.WORK_START_DEPARTMENT_ID = stao.DEPARTMENT_ID
+        left join sys_user as stau on f.WORK_START_USER_ID = stau.USER_ID
+
+        left join oa_department as endo on f.WORK_END_DEPARTMENT_ID = endo.DEPARTMENT_ID
+        left join sys_user as endu on f.WORK_END_USER_ID = endu.USER_ID
+
         left join (select log.* from vi_eightwork_flow_log log order by log.ACT_TIME desc limit 1) log on log.WORK_ID = f.HOTWORK_ID
         where f.ISDELETE = '0'
         <if test="pd.STEP_NAME != null and pd.STEP_NAME != ''"><!-- 关键词检索 -->