From 532a12f2d51e149bc0c2d6c9baf8cdc06c9fb2d4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 00:45:21 +0800
Subject: [PATCH] 工单号测试

---
 ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index cf0a2d3..2e5d86c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -43,7 +43,6 @@
         //鍏ㄥ勾鐣欏瓨鏁�
         int allFiles = 0;
     }
-    //TODO:鏀逛负MonitorQualifyResult
     @Override
     public void calculate(List<MonitorQualifyResult> list) {
         //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
@@ -54,10 +53,15 @@
         List<TMonitorVO> monitorVOS = monitorMapper.selectMonitorVOList();
         areaStatsMap.forEach((key,areaStats)->{
             if(key.startsWith(ApiConstants.Province)){
-                long count = monitorVOS.stream().filter(vo -> ApiConstants.TRUE.equals(vo.getProvinceTag()))
+                long count = monitorVOS.stream().filter(TMonitorVO::getProvinceTag)
                         .filter(vo -> key.split("_")[1].equals(vo.getDeptId() + "")).count();
                 areaStats.allFiles = Integer.parseInt(count+"");
-            }else {
+            }else if(key.startsWith(ApiConstants.Dept)){
+                long count = monitorVOS.stream().filter(TMonitorVO::getDeptTag)
+                        .filter(vo -> key.split("_")[1].equals(vo.getDeptId() + "")).count();
+                areaStats.allFiles = Integer.parseInt(count+"");
+            }
+            else {
                 long count = monitorVOS.stream().filter(vo -> key.equals(vo.getDeptId() + "")).count();
                 areaStats.allFiles = Integer.parseInt(count+"");
             }

--
Gitblit v1.8.0