From 57bcd4591c78a9dc2a99f6f7a7ea83bdc54ec459 Mon Sep 17 00:00:00 2001
From: fangjiakai <450850793@qq.com>
Date: Mon, 5 Feb 2024 17:28:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=81=AB=E4=BD=9C=E4=B8=9A=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=8F=AF=E8=B7=B3=E8=BF=87=E6=AD=A5=E9=AA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
index 8aae5a2..5731d8c 100644
--- a/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
+++ b/src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
@@ -434,8 +434,8 @@
         endo.`NAME` as WORK_END_DEPARTMENT_NAME,
         endu.`NAME` as WORK_END_USER_NAME,
         log.STEP_NAME,
-        log.NEXT_STEP_ID,
-        log.NEXT_STEP_NAME,
+        flow.NEXT_STEP_ID,
+        n.STEP_NAME as NEXT_STEP_NAME,
         log.STATUS
         from
         <include refid="tableName"></include> f
@@ -480,6 +480,9 @@
 
         left join (select * from(select * from vi_eightwork_flow_log log having 1 order by log.ACT_TIME desc
                     ) tmp group by tmp.WORK_ID) log on log.WORK_ID = f.HOTWORK_ID
+
+        left join bus_eightwork_task_flow flow on flow.STEP_ID = f.STEP_ID and flow.TASK_ID = log.TASK_ID
+        left join bus_eightwork_step n on n.STEP_ID = flow.NEXT_STEP_ID
         where f.ISDELETE = '0'
         <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
             and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')