Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-05 660b8ca954029592dea971097047d2621212e231

Merge branch 'local_20221104' into huacheng_test

 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);