From c2c8f1fcd02448bf8ae632c19d9a802b8a1c4024 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 09:49:11 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index 637855c..cec6ea6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -1104,7 +1104,7 @@
if (0!=all){
BigDecimal countNum = new BigDecimal(statisticsPhotoVO.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));
statisticsPhotoVO.setPercent(percent);
}
}
@@ -1129,7 +1129,7 @@
if (0L!=sum) {
BigDecimal countNum = new BigDecimal(statisticsPhotoVO.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));
statisticsPhotoVO.setPercent(percent);
}
}
@@ -1161,14 +1161,17 @@
}
chartMap.put(month,map1);
}
- Map<String, List<StatisticsPhotoVO>> stringListMap = statisticsPhotoVOS1.stream().collect(Collectors.groupingBy(StatisticsPhotoVO::getCountName));
+ Map<String, List<StatisticsPhotoVO>> stringListMap = statisticsPhotoVOS1
+ .stream()
+ .sorted(Comparator.comparing(StatisticsPhotoVO::getStatisticsDate))
+ .collect(Collectors.groupingBy(StatisticsPhotoVO::getCountName));
Map<String,Object> retMap = new HashMap<>();
retMap.put("statisticsPhotoVOS",statisticsPhotoVOS);
retMap.put("monthMap",stringListMap);
- return R.ok();
+ return R.ok(retMap);
}
}
--
Gitblit v1.7.1