From d6b81d600ab6671e532ed77ed6fb00678e5b864b Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 18 八月 2023 14:40:01 +0800
Subject: [PATCH] 志愿者活动增加经纬度字段
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActAcidRecordServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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..72bf5de 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
@@ -11,6 +11,7 @@
import com.panzhihua.common.model.dtos.community.acid.BatchCheckAcidRecordDTO;
import com.panzhihua.common.model.dtos.community.acid.ComActAcidRecordDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.StatisticsPhotoVO;
import com.panzhihua.common.model.vos.community.acid.*;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.DateUtils;
@@ -29,6 +30,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -622,13 +624,13 @@
if (0!=all){
BigDecimal countNum = new BigDecimal(comActAcidColorChartsVO.getCountNum());
BigDecimal allDecimal = new BigDecimal(all);
- BigDecimal percent = countNum.divide(allDecimal,2, BigDecimal.ROUND_HALF_DOWN);
+ BigDecimal percent = countNum.divide(allDecimal,4, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(100));
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();
@@ -646,18 +648,45 @@
if (0L!=sum) {
BigDecimal countNum = new BigDecimal(comActAcidColorChartsVO.getCountNum());
BigDecimal sumDecimal = new BigDecimal(sum);
- BigDecimal percent = countNum.divide(sumDecimal, 2, BigDecimal.ROUND_HALF_DOWN);
+ BigDecimal percent = countNum.divide(sumDecimal, 4, BigDecimal.ROUND_HALF_DOWN).multiply(new BigDecimal(100));
comActAcidColorChartsVO.setPercent(percent);
}
}
}
- Map<String, Map<String, ComActAcidColorChartsVO>> chartMap = comActAcidColorChartsVOS1
+ Map<String, Map<String, ComActAcidColorChartsVO>> colletMap = comActAcidColorChartsVOS1
.stream()
.collect(Collectors.groupingBy(ComActAcidColorChartsVO::getCountName,
Collectors.toMap(ComActAcidColorChartsVO::getColorMark, Function.identity())));
+ String[] statusArr = {"红码","黄码","绿码"};
+ List<String> latest5Month = DateUtils.getLatest12Month(LocalDate.now(), 5);
+ for (String month : latest5Month) {
+ Map<String, ComActAcidColorChartsVO> map1;
+ if(colletMap.containsKey(month)){
+ map1 = colletMap.get(month);
+ }else {
+ map1 = new HashMap<>();
+ }
+ for (String status : statusArr) {
+ if (!map1.containsKey(status)){
+ ComActAcidColorChartsVO comActAcidColorChartsVO = new ComActAcidColorChartsVO();
+ comActAcidColorChartsVO.setCountNum(0);
+ comActAcidColorChartsVO.setCountName(month);
+ comActAcidColorChartsVO.setColorMark(status);
+ comActAcidColorChartsVOS1.add(comActAcidColorChartsVO);
+ map1.put(status,comActAcidColorChartsVO);
+ }
+ }
+ colletMap.put(month,map1);
+ }
+
+
+ Map<String, List<ComActAcidColorChartsVO>> chartMap = comActAcidColorChartsVOS1
+ .stream().sorted(Comparator.comparing(ComActAcidColorChartsVO::getCountName))
+ .collect(Collectors.groupingBy(ComActAcidColorChartsVO::getColorMark));
+
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