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

动火作业安全措施添加图片

pull/4/head
chenxinying 2024-01-30 08:54:02 +08:00
parent 3403a1c0e8
commit 6a75293abd
7 changed files with 45 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zcloud/controller/eightwork/AppEightWorkController.java
View File

@ -49,7 +49,7 @@ public class AppEightWorkController extends BaseController {
page.setPd(pd);
List<PageData> varList = eightWorkService.list(page); //列出confinedspace列表
map.put("varList", varList);
map.put("page", page);
// map.put("page", page);
map.put("result", errInfo);
return map;
}

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

@ -124,6 +124,9 @@ public class HotworkServiceImpl implements HotworkService {
//保存签名信息
PageData sign = new PageData();
if(work.getString("IMG_PATH") != ""){
sign.put("IMG_PATH", work.get("IMG_PATH"));
}
sign.put(primary_key, work.get(primary_key));
sign.put("STEP_ID", work.get("STEP_ID"));
sign.put("SIGN_USER_ID", work.get("USER_ID"));
@ -176,6 +179,9 @@ public class HotworkServiceImpl implements HotworkService {
PageData sign = new PageData();
sign.put("SIGN_PATH", item.getString("SIGN_PATH").split(","));
sign.put("SIGN_TIME", item.getString("SIGN_TIME").split(","));
if(item.getString("IMG_PATH") != null || "".equals(item.getString("IMG_PATH"))){
sign.put("IMG_PATH", item.getString("IMG_PATH").split(","));
}
sign.put("DESCR", item.getString("DESCR") != null ? item.getString("DESCR") : "无");
if(rmap.containsKey(item.getString("CODE"))){
rmap.get(item.getString("CODE")).add(sign);
@ -373,6 +379,8 @@ public class HotworkServiceImpl implements HotworkService {
log.put("WORK_ID", pd.get(primary_key));
log.put("TASK_ID", pd.get("TASK_ID"));
log.put("STEP_ID", pd.get("STEP_ID"));
log.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
log.put("CHECK_NO", pd.get("CHECK_NO"));
log.put("ACT_USER", act_user);
log.put("ACT_TIME", DateUtil.date2Str(new Date()));
log.put("STATUS", status);

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

@ -21,7 +21,9 @@
f.ACT_USER,
f.ACT_TIME,
f.STATUS,
f.WORK_TYPE
f.WORK_TYPE,
f.CORPINFO_ID,
f.CHECK_NO
</sql>
<!-- 字段用于新增 -->
@ -33,7 +35,9 @@
ACT_USER,
ACT_TIME,
STATUS,
WORK_TYPE
WORK_TYPE,
CORPINFO_ID,
CHECK_NO
</sql>
<!-- 字段值 -->
@ -45,7 +49,9 @@
#{ACT_USER},
#{ACT_TIME},
#{STATUS},
#{WORK_TYPE}
#{WORK_TYPE},
#{CORPINFO_ID},
#{CHECK_NO}
</sql>
<!-- 新增-->

4
src/main/resources/mybatis/datasource/eightwork/EightWorkMapper.xml
View File

@ -4,13 +4,13 @@
<!-- 列表 -->
<select id="datalist" parameterType="page" resultType="pd">
<!-- select
select
CONCAT_WS(" ","受限空间作业",f.CHECK_NO) as CHECK_NO,f.CONFINEDSPACE_ID as ID
from
bus_confinedspace f
where f.ISDELETE = '0' and f.STEP_ID &gt; 0 and f.STEP_ID &lt; 15 and f.CORPINFO_ID = #{pd.CORPINFO_ID}
union
select
<!-- select
CONCAT_WS(" ","盲板抽堵作业",b.CHECK_NO) as CHECK_NO,b.BLINDBOARD_ID as ID
from
bus_blindboard b

5
src/main/resources/mybatis/datasource/eightwork/EightWorkTaskMapper.xml
View File

@ -44,7 +44,10 @@
<select id="checkWorkCount" parameterType="pd" resultType="pd" >
select (select count(1) COUNT from bus_hotwork_sign sign
left join bus_hotwork work on work.HOTWORK_ID = sign.HOTWORK_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOTWORK_COUNT
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') HOTWORK_COUNT,
(select count(1) COUNT from bus_confinedspace_sign sign
left join bus_confinedspace work on work.CONFINEDSPACE_ID = sign.CONFINEDSPACE_ID
where sign.SIGN_TIME is null and sign.SIGN_USER_ID = #{USER_ID} and work.STEP_ID != '-1') CONFINEDSPACE_COUNT
</select>
</mapper>

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

@ -56,7 +56,9 @@
f.WORK_END_USER_ID,
f.ACCEPT_TIME,
f.PLS_ID,
f.PLS_NAME
f.PLS_NAME,
f.LONGITUDE,
f.LATITUDE
</sql>
<!-- 字段用于新增 -->
@ -109,7 +111,9 @@
WORK_END_USER_ID,
ACCEPT_TIME,
PLS_ID,
PLS_NAME
PLS_NAME,
LONGITUDE,
LATITUDE
</sql>
<!-- 字段值 -->
@ -162,7 +166,9 @@
#{WORK_END_USER_ID},
#{ACCEPT_TIME},
#{PLS_ID},
#{PLS_NAME}
#{PLS_NAME},
#{LONGITUDE},
#{LATITUDE}
</sql>
<!-- 获取编码 -->
@ -244,7 +250,9 @@
WORK_END_USER_ID=#{WORK_END_USER_ID},
ACCEPT_TIME = #{ACCEPT_TIME},
PLS_ID = #{PLS_ID},
PLS_NAME = #{PLS_NAME}
PLS_NAME = #{PLS_NAME},
LONGITUDE =#{LONGITUDE},
LATITUDE =#{LATITUDE}
where
HOTWORK_ID = #{HOTWORK_ID}
</update>

13
src/main/resources/mybatis/datasource/eightwork/HotworkSignMapper.xml
View File

@ -21,7 +21,8 @@
f.SIGN_PATH,
f.SIGN_TIME,
f.DESCR,
f.STEP_ID
f.STEP_ID,
f.IMG_PATH
</sql>
<!-- 字段用于新增 -->
@ -33,7 +34,8 @@
SIGN_PATH,
SIGN_TIME,
DESCR,
STEP_ID
STEP_ID,
IMG_PATH
</sql>
<!-- 字段值 -->
@ -45,7 +47,8 @@
#{SIGN_PATH},
#{SIGN_TIME},
#{DESCR},
#{STEP_ID}
#{STEP_ID},
#{IMG_PATH}
</sql>
<!-- 新增-->
@ -85,7 +88,8 @@
set
DESCR = #{DESCR},
SIGN_PATH = #{SIGN_PATH},
SIGN_TIME= #{SIGN_TIME}
SIGN_TIME= #{SIGN_TIME},
IMG_PATH = #{IMG_PATH}
where
HOTWORK_ID = #{HOTWORK_ID} and SIGN_USER_ID = #{SIGN_USER_ID} and STEP_ID = #{STEP_ID}
</update>
@ -109,6 +113,7 @@
f.SIGN_PATH,
f.SIGN_TIME,
f.STEP_ID,
f.IMG_PATH,
IFNULL(f.DESCR,'无') as DESCR,
step.CODE
from