diff --git a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java index 61db4d89..7d860a5c 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -544,7 +544,14 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { }else { pd.put("acceptConfessStatus", "1"); } - + //安全措施数据 + List 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); pd.put("BELONGING_USER_ID", belong.getString("USER_ID"));