From 660b8ca954029592dea971097047d2621212e231 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 05 十二月 2022 16:55:16 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
index 6cc8590..45ade73 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java
@@ -626,9 +626,9 @@
comActAcidColorChartsVO.setPercent(percent);
}
}
- Map<String, ComActAcidColorChartsVO> circleMap = comActAcidColorChartsVOS
- .stream()
- .collect(Collectors.toMap(ComActAcidColorChartsVO::getColorMark, Function.identity()));
+// Map<String, ComActAcidColorChartsVO> circleMap = comActAcidColorChartsVOS
+// .stream()
+// .collect(Collectors.toMap(ComActAcidColorChartsVO::getColorMark, Function.identity()));
//月份
List<ComActAcidColorChartsVO> comActAcidColorChartsVOS1 = this.baseMapper.selectColorMarkGroupByMonth();
@@ -657,7 +657,7 @@
Collectors.toMap(ComActAcidColorChartsVO::getColorMark, Function.identity())));
Map<String,Object> retMap = new HashMap<>();
- retMap.put("circleMap",circleMap);
+ retMap.put("comActAcidColorChartsVOS",comActAcidColorChartsVOS);
retMap.put("chartMap",chartMap);
return R.ok(retMap);
--
Gitblit v1.7.1