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

动火添加安全副总

pull/4/head
chenxinying 2024-02-06 15:41:10 +08:00
parent 86adfdbf18
commit ffe52a21c8
7 changed files with 71 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/mapper/datasource/eightwork/HotworkMapper.java
View File

@ -20,6 +20,8 @@ public interface HotworkMapper {
void edit(PageData pd);
void editVideo(PageData pd);
void editGasTime(PageData pd);
void editStep(PageData pd);

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

@ -123,6 +123,7 @@ public class HotworkServiceImpl implements HotworkService {
}
PageData flow = getStep(work.get("TASK_ID"), work.get("STEP_ID"));
work.put("STEP_ID", flow.get("NEXT_STEP_ID"));
hotworkMapper.editVideo(work);
//保存签名信息
PageData sign = new PageData();
@ -238,6 +239,7 @@ public class HotworkServiceImpl implements HotworkService {
@Transactional
public void saveGas(PageData pd, MultipartFile[] files) throws Exception {
PageData work = hotworkMapper.findById(pd);
work.putAll(pd);
List<String> filePaths = new ArrayList<>();
for (int i = 0; i < files.length; i++) {
//保存签名文件

12
src/main/resources/mybatis/datasource/eightwork/ConfinedSpaceGasMapper.xml
View File

@ -27,7 +27,8 @@
f.DATA3,
f.DATA4,
f.CONFINEDSPACEGAS_ID,
f.SIGN_PATH
f.SIGN_PATH,
f.ANALYZE_PART
</sql>
<!-- 字段用于新增 -->
@ -45,7 +46,8 @@
DATA3,
DATA4,
CONFINEDSPACEGAS_ID,
SIGN_PATH
SIGN_PATH,
ANALYZE_PART
</sql>
<!-- 字段值 -->
@ -63,7 +65,8 @@
#{DATA3},
#{DATA4},
#{CONFINEDSPACEGAS_ID},
#{SIGN_PATH}
#{SIGN_PATH},
#{ANALYZE_PART}
</sql>
<!-- 新增-->
@ -105,7 +108,8 @@
DATA3 = #{DATA3},
DATA4 = #{DATA4},
CONFINEDSPACEGAS_ID = CONFINEDSPACEGAS_ID,
SIGN_PATH = #{SIGN_PATH}
SIGN_PATH = #{SIGN_PATH},
ANALYZE_PART = #{ANALYZE_PART}
where
CONFINEDSPACEGAS_ID = #{CONFINEDSPACEGAS_ID}
</update>

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

@ -51,7 +51,8 @@
f.MEDIUM_NAME,
f.LIMITSPACE_ID,
f.WORK_USER_DEPARTMENT_ID,
f.WORK_POSITION
f.WORK_POSITION,
f.VIDEO_PATH
</sql>
<!-- 字段用于新增 -->
@ -99,7 +100,8 @@
MEDIUM_NAME,
LIMITSPACE_ID,
WORK_USER_DEPARTMENT_ID,
WORK_POSITION
WORK_POSITION,
VIDEO_PATH
</sql>
<!-- 字段值 -->
@ -147,7 +149,8 @@
#{MEDIUM_NAME},
#{LIMITSPACE_ID},
#{WORK_USER_DEPARTMENT_ID},
#{WORK_POSITION}
#{WORK_POSITION},
#{VIDEO_PATH}
</sql>
<!-- 获取编码 -->
@ -225,7 +228,8 @@
LIMITSPACE_ID = #{LIMITSPACE_ID},
WORK_USER_DEPARTMENT_ID =#{WORK_USER_DEPARTMENT_ID},
LONGITUDE =#{LONGITUDE},
LATITUDE =#{LATITUDE}
LATITUDE =#{LATITUDE},
VIDEO_PATH = #{VIDEO_PATH}
where
CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
</update>
@ -269,19 +273,6 @@
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,
start.SIGN_TIME as WORK_START_USER_SIGNER_TIME,
start.SIGN_PATH as WORK_START_USER_SIGNER_PATH,
end.SIGN_TIME as WORK_END_USER_SIGNER_TIME,
end.SIGN_PATH as WORK_END_USER_SIGNER_PATH,
accept.SIGN_TIME as ACCEPT_USER_SIGNER_TIME,
accept.SIGN_PATH as ACCEPT_USER_SIGNER_PATH,
IFNULL(accept.DESCR,'无') as ACCEPT_CONTENT,
sp.NAME as LIMITSPACE_NAME,
f.ANALYZE_TIME
FROM
@ -322,11 +313,6 @@
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_confinedspace_sign confirm on confirm.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and confirm.STEP_ID = '8'
left join bus_confinedspace_sign leader on leader.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and leader.STEP_ID = '9'
left join bus_confinedspace_sign start on start.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and start.STEP_ID = '13'
left join bus_confinedspace_sign end on end.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and end.STEP_ID = '14'
left join bus_confinedspace_sign accept on accept.CONFINEDSPACE_ID = f.CONFINEDSPACE_ID and accept.STEP_ID = '15'
WHERE f.CONFINEDSPACE_ID = #{CONFINEDSPACE_ID}
</select>

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

@ -53,7 +53,8 @@
f.WORK_POSITION,
f.WORK_USER_DEPARTMENT_ID,
f.WORK_USER_ID,
f.WORK_HIGH
f.WORK_HIGH,
f.VIDEO_PATH
</sql>
<!-- 字段用于新增 -->
@ -103,7 +104,8 @@
WORK_POSITION,
WORK_USER_DEPARTMENT_ID,
WORK_USER_ID,
WORK_HIGH
WORK_HIGH,
VIDEO_PATH
</sql>
<!-- 字段值 -->
@ -153,7 +155,8 @@
#{WORK_POSITION},
#{WORK_USER_DEPARTMENT_ID},
#{WORK_USER_ID},
#{WORK_HIGH}
#{WORK_HIGH},
#{VIDEO_PATH}
</sql>
<!-- 获取编码 -->
@ -232,7 +235,8 @@
WORK_POSITION =#{WORK_POSITION},
WORK_USER_DEPARTMENT_ID = #{WORK_USER_DEPARTMENT_ID},
WORK_USER_ID = #{WORK_USER_ID},
WORK_HIGH = #{WORK_HIGH}
WORK_HIGH = #{WORK_HIGH},
VIDEO_PATH = #{VIDEO_PATH}
where
HIGHWORK_ID = #{HIGHWORK_ID}
</update>
@ -267,26 +271,7 @@
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,
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,
start.SIGN_TIME as WORK_START_USER_SIGNER_TIME,
start.SIGN_PATH as WORK_START_USER_SIGNER_PATH,
end.SIGN_TIME as WORK_END_USER_SIGNER_TIME,
end.SIGN_PATH as WORK_END_USER_SIGNER_PATH,
accept.SIGN_TIME as ACCEPT_USER_SIGNER_TIME,
accept.SIGN_PATH as ACCEPT_USER_SIGNER_PATH,
IFNULL(accept.DESCR,'无') as ACCEPT_CONTENT
endu.`NAME` as WORK_END_USER_NAME
FROM
bus_highwork AS f
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
@ -323,13 +308,6 @@
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_highwork_sign confirm on confirm.HIGHWORK_ID = f.HIGHWORK_ID and confirm.STEP_ID = '8'
left join bus_highwork_sign leader on leader.HIGHWORK_ID = f.HIGHWORK_ID and leader.STEP_ID = '9'
left join bus_highwork_sign audit on audit.HIGHWORK_ID = f.HIGHWORK_ID and audit.STEP_ID = '10'
left join bus_highwork_sign approve on approve.HIGHWORK_ID = f.HIGHWORK_ID and approve.STEP_ID = '11'
left join bus_highwork_sign start on start.HIGHWORK_ID = f.HIGHWORK_ID and start.STEP_ID = '13'
left join bus_highwork_sign end on end.HIGHWORK_ID = f.HIGHWORK_ID and end.STEP_ID = '14'
left join bus_highwork_sign accept on accept.HIGHWORK_ID = f.HIGHWORK_ID and accept.STEP_ID = '15'
WHERE f.HIGHWORK_ID = #{HIGHWORK_ID}
</select>

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

@ -57,7 +57,10 @@
f.ACCEPT_TIME,
f.PLS_ID,
f.PLS_NAME,
f.WORK_POSITION
f.WORK_POSITION,
f.SAFETY_DEPARTMENT_ID,
f.SAFETY_USER_ID,
f.VIDEO_PATH
</sql>
<!-- 字段用于新增 -->
@ -111,7 +114,10 @@
ACCEPT_TIME,
PLS_ID,
PLS_NAME,
WORK_POSITION
WORK_POSITION,
SAFETY_DEPARTMENT_ID,
SAFETY_USER_ID,
VIDEO_PATH
</sql>
<!-- 字段值 -->
@ -165,7 +171,10 @@
#{ACCEPT_TIME},
#{PLS_ID},
#{PLS_NAME},
#{WORK_POSITION}
#{WORK_POSITION},
#{SAFETY_DEPARTMENT_ID},
#{SAFETY_USER_ID},
#{VIDEO_PATH}
</sql>
<!-- 获取编码 -->
@ -197,7 +206,14 @@
where
HOTWORK_ID = #{HOTWORK_ID}
</delete>
<update id="editVideo" parameterType="pd">
update
<include refid="tableName"></include>
set
VIDEO_PATH = #{VIDEO_PATH}
where
HOTWORK_ID = #{HOTWORK_ID}
</update>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
@ -249,7 +265,10 @@
PLS_ID = #{PLS_ID},
PLS_NAME = #{PLS_NAME},
LONGITUDE =#{LONGITUDE},
LATITUDE =#{LATITUDE}
LATITUDE =#{LATITUDE},
SAFETY_DEPARTMENT_ID =#{SAFETY_DEPARTMENT_ID},
SAFETY_USER_ID = #{SAFETY_USER_ID},
VIDEO_PATH = #{VIDEO_PATH}
where
HOTWORK_ID = #{HOTWORK_ID}
</update>
@ -299,31 +318,14 @@
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,
start.SIGN_TIME as WORK_START_USER_SIGNER_TIME,
start.SIGN_PATH as WORK_START_USER_SIGNER_PATH,
end.SIGN_TIME as WORK_END_USER_SIGNER_TIME,
end.SIGN_PATH as WORK_END_USER_SIGNER_PATH,
accept.SIGN_TIME as ACCEPT_USER_SIGNER_TIME,
accept.SIGN_PATH as ACCEPT_USER_SIGNER_PATH,
IFNULL(accept.DESCR,'无') as ACCEPT_CONTENT,
safo.`NAME` as SAFETY_DEPARTMENT_NAME,
safu.`NAME` as SAFETY_USER_NAME,
f.ANALYZE_TIME
FROM
bus_hotwork AS f
left join oa_department as safo on f.SAFETY_DEPARTMENT_ID = safo.DEPARTMENT_ID
left join sys_user as safu on f.SAFETY_USER_ID = safu.USER_ID
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID
@ -363,14 +365,6 @@
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'
left join bus_hotwork_sign start on start.HOTWORK_ID = f.HOTWORK_ID and start.STEP_ID = '13'
left join bus_hotwork_sign end on end.HOTWORK_ID = f.HOTWORK_ID and end.STEP_ID = '14'
left join bus_hotwork_sign accept on accept.HOTWORK_ID = f.HOTWORK_ID and accept.STEP_ID = '15'
WHERE f.HOTWORK_ID = #{HOTWORK_ID}
</select>
@ -433,12 +427,17 @@
stau.`NAME` as WORK_START_USER_NAME,
endo.`NAME` as WORK_END_DEPARTMENT_NAME,
endu.`NAME` as WORK_END_USER_NAME,
safo.`NAME` as SAFETY_DEPARTMENT_NAME,
safu.`NAME` as SAFETY_USER_NAME,
log.STEP_NAME,
flow.NEXT_STEP_ID,
n.STEP_NAME as NEXT_STEP_NAME,
log.STATUS
from
<include refid="tableName"></include> f
left join oa_department as safo on f.SAFETY_DEPARTMENT_ID = safo.DEPARTMENT_ID
left join sys_user as safu on f.SAFETY_USER_ID = safu.USER_ID
left join oa_department as appo on f.APPLY_DEPARTMENT_ID = appo.DEPARTMENT_ID
left join sys_user as appu on f.APPLY_USER_ID = appu.USER_ID

12
src/main/resources/mybatis/datasource/eightwork/HotworkGasMapper.xml
View File

@ -21,7 +21,8 @@
f.ANALYZE_USER,
f.ISDELETE,
f.HOTWORKGAS_ID,
f.SIGN_PATH
f.SIGN_PATH,
f.ANALYZE_GAS
</sql>
<!-- 字段用于新增 -->
@ -33,7 +34,8 @@
ANALYZE_USER,
ISDELETE,
HOTWORKGAS_ID,
SIGN_PATH
SIGN_PATH,
ANALYZE_GAS
</sql>
<!-- 字段值 -->
@ -45,7 +47,8 @@
#{ANALYZE_USER},
#{ISDELETE},
#{HOTWORKGAS_ID},
#{SIGN_PATH}
#{SIGN_PATH},
#{ANALYZE_GAS}
</sql>
<!-- 新增-->
@ -81,7 +84,8 @@
ANALYZE_USER = #{ANALYZE_USER},
ISDELETE = #{ISDELETE},
HOTWORKGAS_ID = HOTWORKGAS_ID,
SIGN_PATH = #{SIGN_PATH}
SIGN_PATH = #{SIGN_PATH},
ANALYZE_GAS = #{ANALYZE_GAS}
where
HOTWORKGAS_ID = #{HOTWORKGAS_ID}
</update>