From a9dbc94387ac77d73729681d03c35cb2f651c0fc Mon Sep 17 00:00:00 2001 From: liujun Date: Mon, 5 Feb 2024 11:41:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=85=AC=E5=8F=B8=E5=8A=A8=E7=81=AB?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E8=BF=87=E7=A8=8B=E4=B8=AD=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../highriskwork/impl/HotworkCfdServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 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 998d425a..6b6595dd 100644 --- a/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java +++ b/src/main/java/com/zcloud/service/highriskwork/impl/HotworkCfdServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -377,7 +378,19 @@ public class HotworkCfdServiceImpl implements HotworkCfdService { info.put("confessNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); condition.put("TYPE", "1"); // 项目主管部门需处理数 - info.put("belongingNum", busHotworkCfdExamineMapper.findByCondition(condition).size()); + List _belongingList = busHotworkCfdExamineMapper.findByCondition(condition); + List belongList = new ArrayList(); + for (PageData x : _belongingList) { + PageData condition1 = new PageData(); + condition1.put("HOTWORK_ID", x.get("HOTWORK_ID")); + condition1.put("IS_DELETE", "0"); + PageData hotWorkInfo = hotworkCfdMapper.findById(condition1); + if ("1.5".equals(hotWorkInfo.getString("APPLY_STATUS"))) { + belongList.add(x); + } + } + + info.put("belongingNum", belongList.size()); condition.put("TYPE", "2"); // 安全项检查人需处理数 info.put("safetyNum", busHotworkCfdExamineMapper.findByCondition(condition).size());