From c361f8f794b2f099c5666b7c88c1728728b2fc3d Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Tue, 11 Jun 2024 16:17:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E7=81=AB=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=9C=AA=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E6=8E=AA=E6=96=BD=E7=A1=AE=E8=AE=A4=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=9B=91=E6=8A=A4=E4=BA=BA=EF=BC=8C=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E4=BA=A4=E5=BA=95=E4=BA=BA=E5=92=8C=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E4=BA=A4=E5=BA=95=E4=BA=BA=E7=AD=BE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/highriskwork/impl/HotworkCfdServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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"));