From 8f83a63bc5f046e34a1a06bcf6f1a8241c7277ac Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 24 九月 2024 12:14:11 +0800 Subject: [PATCH] 增加部级考核标签 --- ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 9 +++++++-- 1 files changed, 7 insertions(+), 2 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 bbcbb18..2e5d86c 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java @@ -53,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