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 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' and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')