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

八项作业流程图

pull/4/head
fangjiakai 2024-02-21 10:47:59 +08:00
parent 089969712d
commit 29f9cbcfca
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/resources/mybatis/datasource/eightwork/ConfinedspaceMapper.xml
View File

@ -462,11 +462,14 @@
<select id="getFlowList" resultType="pd"> <select id="getFlowList" resultType="pd">
select select
flow.CAN_SKIP,
flow.ACTOR_FIELD,
step.STEP_NAME, step.STEP_NAME,
user.NAME as ACT_USER_NAME, user.NAME as ACT_USER_NAME,
log.ACT_TIME, log.ACT_TIME,
log.STATUS, log.STATUS,
cu.SIGN_USER, cu.SIGN_USER,
cu.FINISHED_SIGN_USER,
cu.STEP_ID as CURRENT_STEP cu.STEP_ID as CURRENT_STEP
from from
bus_eightwork_task_flow flow bus_eightwork_task_flow flow
@ -474,9 +477,12 @@
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
log.WORK_ID = #{CONFINEDSPACE_ID} log.WORK_ID = #{CONFINEDSPACE_ID}
left join sys_user user on user.USER_ID = log.ACT_USER left join sys_user user on user.USER_ID = log.ACT_USER
left join (select sign.STEP_ID,GROUP_CONCAT(signer.NAME) sign_user from bus_confinedspace_sign sign left join (select sign.STEP_ID,
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
from bus_confinedspace_sign sign
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID} left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
and sign.SIGN_TIME is null) cu on cu.STEP_ID = step.STEP_ID GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
where where
flow.TASK_ID = #{TASK_ID} flow.TASK_ID = #{TASK_ID}
and and

10
src/main/resources/mybatis/datasource/eightwork/HighWorkMapper.xml
View File

@ -445,11 +445,14 @@
<select id="getFlowList" resultType="pd"> <select id="getFlowList" resultType="pd">
select select
flow.CAN_SKIP,
flow.ACTOR_FIELD,
step.STEP_NAME, step.STEP_NAME,
user.NAME as ACT_USER_NAME, user.NAME as ACT_USER_NAME,
log.ACT_TIME, log.ACT_TIME,
log.STATUS, log.STATUS,
cu.SIGN_USER, cu.SIGN_USER,
cu.FINISHED_SIGN_USER,
cu.STEP_ID as CURRENT_STEP cu.STEP_ID as CURRENT_STEP
from from
bus_eightwork_task_flow flow bus_eightwork_task_flow flow
@ -457,9 +460,12 @@
left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and left join bus_eightwork_flow_log log on log.STEP_ID = flow.STEP_ID and
log.WORK_ID = #{HIGHWORK_ID} log.WORK_ID = #{HIGHWORK_ID}
left join sys_user user on user.USER_ID = log.ACT_USER left join sys_user user on user.USER_ID = log.ACT_USER
left join (select sign.STEP_ID,GROUP_CONCAT(signer.NAME) sign_user from bus_highwork_sign sign left join (select sign.STEP_ID,
GROUP_CONCAT( if(sign.SIGN_TIME IS NULL,signer.NAME,null) ) sign_user,
GROUP_CONCAT( if(sign.SIGN_TIME IS not NULL,signer.NAME,null) ) finished_sign_user
from bus_highwork_sign sign
left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.HIGHWORK_ID = #{HIGHWORK_ID} left join sys_user signer on signer.USER_ID = sign.SIGN_USER_ID where sign.HIGHWORK_ID = #{HIGHWORK_ID}
and sign.SIGN_TIME is null) cu on cu.STEP_ID = step.STEP_ID GROUP BY sign.STEP_ID) cu on cu.STEP_ID = step.STEP_ID
where where
flow.TASK_ID = #{TASK_ID} flow.TASK_ID = #{TASK_ID}
and and