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

动火添加作业开始和作业结束

pull/4/head
chenxinying 2024-01-22 14:05:11 +08:00
parent 298b10c1de
commit 3507bf61a9
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 != ''"><!-- 关键词检索 -->