From 6493519966944e5d23af8401517d27de424a7259 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 12 十月 2024 19:32:25 +0800
Subject: [PATCH] 工单号bug
---
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
index 402ce11..0c4b8a5 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -19,14 +19,14 @@
*/
@Component
@Slf4j
-public abstract class IndexCalculationServe <T extends BaseResult, S> extends IndexCalculationUtils {
+public abstract class IndexCalculationServe<T extends BaseResult, S> extends IndexCalculationUtils {
@Autowired
private TMonitorMapper monitorMapper;
//鎶借薄鏂规硶锛岀敱瀛愮被缂栧啓鍏蜂綋閫昏緫绠楁硶
protected abstract void updateAreaStats(Map<String, S> areaStatsMap, String key, T result);
- protected Map<String, S> getAreaStatsMap(List<T> list){
+ protected Map<String, S> getAreaStatsMap(List<T> list, Boolean needDept) {
if (CollectionUtils.isEmpty(list)) {
log.info("鏁版嵁涓虹┖");
return null;
@@ -44,10 +44,17 @@
updateAreaStats(areaStatsMap, deptId, result);
// 澶勭悊鐪佸巺鏁版嵁
- if (result.getProvinceTag()!=null && result.getProvinceTag()) {
+ if (result.getProvinceTag() != null && result.getProvinceTag()) {
String provinceKey = ApiConstants.Province + deptId;
updateAreaStats(areaStatsMap, provinceKey, result);
}
+ // 澶勭悊鍏畨閮ㄦ暟鎹�
+ if (needDept) {
+ if (result.getDeptTag() != null && result.getDeptTag()) {
+ String deptKey = ApiConstants.Dept + deptId;
+ updateAreaStats(areaStatsMap, deptKey, result);
+ }
+ }
}
return areaStatsMap;
}
--
Gitblit v1.8.0