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

动火添加验收时间字段，更新作业开始时间，结束时间和验收时间

pull/4/head
chenxinying 2024-01-24 09:25:29 +08:00
parent 0650dffac0
commit 22dd31c65a
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zcloud/service/eightwork/impl/HotworkServiceImpl.java
View File

@ -133,7 +133,6 @@ public class HotworkServiceImpl implements HotworkService {
List<PageData> unsignedList = hotworkSignMapper.checkUnsigned(sign);//当前步骤未签名人列表
if(unsignedList == null || unsignedList.size() == 0){//如果没有未签人 则跳转下一步
hotworkMapper.editStep(pd);
if (pd.get("PREPARERS") != null && !pd.get("PREPARERS").equals("")) { //如果是设置安全措施确认人步骤

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

@ -53,7 +53,8 @@
f.WORK_START_DEPARTMENT_ID,
f.WORK_START_USER_ID,
f.WORK_END_DEPARTMENT_ID,
f.WORK_END_USER_ID
f.WORK_END_USER_ID,
f.ACCEPT_TIME
</sql>
<!-- 字段用于新增 -->
@ -103,7 +104,8 @@
WORK_START_DEPARTMENT_ID,
WORK_START_USER_ID,
WORK_END_DEPARTMENT_ID,
WORK_END_USER_ID
WORK_END_USER_ID,
ACCEPT_TIME
</sql>
<!-- 字段值 -->
@ -153,7 +155,8 @@
#{WORK_START_DEPARTMENT_ID},
#{WORK_START_USER_ID},
#{WORK_END_DEPARTMENT_ID},
#{WORK_END_USER_ID}
#{WORK_END_USER_ID},
#{ACCEPT_TIME}
</sql>
<!-- 获取编码 -->
@ -232,7 +235,8 @@
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}
WORK_END_USER_ID=#{WORK_END_USER_ID},
ACCEPT_TIME = #{ACCEPT_TIME}
where
HOTWORK_ID = #{HOTWORK_ID}
</update>
@ -282,6 +286,21 @@
stau.`NAME` as WORK_START_USER_NAME,
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME,
confirm.SIGN_TIME as CONFIRM_USER_SIGNER_TIME,
confirm.SIGN_PATH as CONFIRM_USER_SIGNER_PATH,
IFNULL(confirm.DESCR,'无') as CONFIRM_CONTENT,
leader.SIGN_TIME as LEADER_USER_SIGNER_TIME,
leader.SIGN_PATH as LEADER_USER_SIGNER_PATH,
IFNULL(leader.DESCR,'无') as LEADER_CONTENT,
audit.SIGN_TIME as AUDIT_USER_SIGNER_TIME,
audit.SIGN_PATH as AUDIT_USER_SIGNER_PATH,
IFNULL(audit.DESCR,'无') as AUDIT_CONTENT,
approve.SIGN_TIME as APPROVE_USER_SIGNER_TIME,
approve.SIGN_PATH as APPROVE_USER_SIGNER_PATH,
IFNULL(approve.DESCR,'无') as APPROVE_CONTENT,
monitor.SIGN_TIME as MONITOR_USER_SIGNER_TIME,
monitor.SIGN_PATH as MONITOR_USER_SIGNER_PATH,
IFNULL(monitor.DESCR,'无') as MONITOR_CONTENT,
f.ANALYZE_TIME
FROM
bus_hotwork AS f
@ -323,6 +342,12 @@
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 bus_hotwork_sign confirm on confirm.HOTWORK_ID = f.HOTWORK_ID and confirm.STEP_ID = '8'
left join bus_hotwork_sign leader on leader.HOTWORK_ID = f.HOTWORK_ID and leader.STEP_ID = '9'
left join bus_hotwork_sign audit on audit.HOTWORK_ID = f.HOTWORK_ID and audit.STEP_ID = '10'
left join bus_hotwork_sign approve on approve.HOTWORK_ID = f.HOTWORK_ID and approve.STEP_ID = '11'
left join bus_hotwork_sign monitor on monitor.HOTWORK_ID = f.HOTWORK_ID and monitor.STEP_ID = '12'
WHERE f.HOTWORK_ID = #{HOTWORK_ID}
</select>
@ -331,6 +356,15 @@
update
<include refid="tableName"></include>
set
<if test="WORK_START_DATE != null and WORK_START_DATE != ''"><!-- 关键词检索 -->
f.WORK_START_DATE = #{WORK_START_DATE},
</if>
<if test="WORK_END_DATE != null and WORK_END_DATE != ''"><!-- 关键词检索 -->
f.WORK_END_DATE = #{WORK_END_DATE},
</if>
<if test="ACCEPT_TIME != null and ACCEPT_TIME != ''"><!-- 关键词检索 -->
f.ACCEPT_TIME = #{ACCEPT_TIME},
</if>
STEP_ID = #{STEP_ID}
where
HOTWORK_ID = #{HOTWORK_ID}