wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

动火作业加入可跳过步骤

pull/4/head
fangjiakai 2024-02-05 17:28:23 +08:00
parent 226bdcf489
commit 57bcd4591c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/resources/mybatis/datasource/eightwork/HotWorkMapper.xml
View File

@ -434,8 +434,8 @@
endo.`NAME` as WORK_END_DEPARTMENT_NAME, endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME, endu.`NAME` as WORK_END_USER_NAME,
log.STEP_NAME, log.STEP_NAME,
log.NEXT_STEP_ID, flow.NEXT_STEP_ID,
log.NEXT_STEP_NAME, n.STEP_NAME as NEXT_STEP_NAME,
log.STATUS log.STATUS
from from
<include refid="tableName"></include> f <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 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 ) 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' where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 --> <if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') and f.CHECK_NO LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')