guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

修改动火作业流程，未进行安全措施确认不允许监护人，安全交底人和接受交底人签字

liujun0703-新项目开发^2^2
WenShiJun 2024-06-11 16:17:04 +08:00
parent 0ae96c5305
commit c361f8f794
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java
View File

@ -544,7 +544,14 @@ public class HotworkCfdServiceImpl implements HotworkCfdService {
}else { }else {
pd.put("acceptConfessStatus", "1"); pd.put("acceptConfessStatus", "1");
} }
//安全措施数据
List<PageData> safetyList = approvalInfos.stream()
.filter(x -> "2".equals(x.getString("TYPE")))
.collect(Collectors.toList());
for (PageData x : safetyList) {
x.put("APPROVAL_STATUS", x.get("APPROVAL_STATUS"));
}
pd.put("safetyList", safetyList);
// 项目责任负责人 // 项目责任负责人
PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null); PageData belong = approvalInfos.stream().filter(x -> "1".equals(x.getString("TYPE"))).findFirst().orElse(null);
pd.put("BELONGING_USER_ID", belong.getString("USER_ID")); pd.put("BELONGING_USER_ID", belong.getString("USER_ID"));