From ac9a9743d185d46ec7dca7577402dfef6a553eed Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 27 四月 2022 11:09:00 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
index 7420353..856a0c2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java
@@ -916,7 +916,8 @@
int size = entry.getValue().size();
temp.setFiled(entry.getKey());
temp.setNum(size);
- temp.setPercent(new BigDecimal(size/teamCount).setScale(2));
+ temp.setPercent(new BigDecimal(size)
+ .divide(new BigDecimal(teamCount), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
teamTypeCircleData.add(temp);
}
}
@@ -943,7 +944,8 @@
int size = entry.getValue().size();
temp.setFiled(entry.getKey());
temp.setNum(size);
- temp.setPercent(new BigDecimal(size/adjustCount).setScale(2));
+ temp.setPercent(new BigDecimal(size)
+ .divide(new BigDecimal(adjustCount), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
adjustCircleData.add(temp);
}
}
@@ -970,7 +972,8 @@
int size = entry.getValue().size();
temp.setFiled(entry.getKey());
temp.setNum(size);
- temp.setPercent(new BigDecimal(size/controlCount).setScale(2));
+ temp.setPercent(new BigDecimal(size)
+ .divide(new BigDecimal(controlCount), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
controlCircleData.add(temp);
}
}
@@ -1107,7 +1110,8 @@
int size = entry.getValue().size();
temp.setFiled(entry.getKey());
temp.setNum(size);
- temp.setPercent(new BigDecimal(size/count).setScale(2));
+ temp.setPercent(new BigDecimal(size)
+ .divide(new BigDecimal(count), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
volunteerServiceTypeCircleData.add(temp);
}
}
@@ -1117,7 +1121,8 @@
int sum = volunteerAgeCircleData.stream().mapToInt(StatisticsCommVO::getNum).sum();
volunteerAgeCircleData.forEach(e -> {
if (sum != 0) {
- e.setPercent(new BigDecimal(e.getNum()/sum).setScale(2));
+ e.setPercent(new BigDecimal(e.getNum())
+ .divide(new BigDecimal(sum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
} else {
e.setPercent(new BigDecimal(0));
}
@@ -1134,7 +1139,8 @@
int size = entry.getValue().size();
temp.setFiled(entry.getKey());
temp.setNum(size);
- temp.setPercent(new BigDecimal(size/count).setScale(2));
+ temp.setPercent(new BigDecimal(size)
+ .divide(new BigDecimal(count), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
volunteerSkillCircleData.add(temp);
}
}
--
Gitblit v1.7.1