From 1c3d824c4e4d8f74eba19dd75e755f78b490ce8f Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 14 三月 2022 17:09:25 +0800
Subject: [PATCH] bug修改
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml | 1 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/BigScreenStatisticsServiceImpl.java | 18 ++++++++++++------
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java | 36 ++++++++++++++++++++++++------------
3 files changed, 37 insertions(+), 18 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);
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
index 584ad3f..ea7b413 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbMemberServiceImpl.java
@@ -871,57 +871,69 @@
if (nonNull(partyMemberNum) && partyMemberNum.intValue() > 0) {
Integer formalPartyMemberNum = statisticsOrgVo.getFormalPartyMemberNum();
if (nonNull(formalPartyMemberNum) && formalPartyMemberNum.intValue() > 0) {
- statisticsOrgVo.setFormalPartyMemberNumPercent(new BigDecimal(formalPartyMemberNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setFormalPartyMemberNumPercent(new BigDecimal(formalPartyMemberNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer preparePartyMemberNum = statisticsOrgVo.getPreparePartyMemberNum();
if (nonNull(preparePartyMemberNum) && preparePartyMemberNum.intValue() > 0) {
- statisticsOrgVo.setPreparePartyMemberNumPercent(new BigDecimal(preparePartyMemberNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setPreparePartyMemberNumPercent(new BigDecimal(preparePartyMemberNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer tyNum = statisticsOrgVo.getTyNum();
if (nonNull(tyNum) && tyNum.intValue() > 0) {
- statisticsOrgVo.setTyNumPercent(new BigDecimal(tyNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setTyNumPercent(new BigDecimal(tyNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer msNum = statisticsOrgVo.getMsNum();
if (nonNull(msNum) && msNum.intValue() > 0) {
- statisticsOrgVo.setMsNumPercent(new BigDecimal(msNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setMsNumPercent(new BigDecimal(msNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer yyNum = statisticsOrgVo.getYyNum();
if (nonNull(yyNum) && yyNum.intValue() > 0) {
- statisticsOrgVo.setYyNumPercent(new BigDecimal(yyNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setYyNumPercent(new BigDecimal(yyNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer wdNum = statisticsOrgVo.getWdNum();
if (nonNull(wdNum) && wdNum.intValue() > 0) {
- statisticsOrgVo.setWdNumPercent(new BigDecimal(wdNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setWdNumPercent(new BigDecimal(wdNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer qtNum = statisticsOrgVo.getQtNum();
if (nonNull(qtNum) && qtNum.intValue() > 0) {
- statisticsOrgVo.setQtNumPercent(new BigDecimal(qtNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setQtNumPercent(new BigDecimal(qtNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer wuNum = statisticsOrgVo.getWuNum();
if (nonNull(wuNum) && wuNum.intValue() > 0) {
- statisticsOrgVo.setWuNumPercent(new BigDecimal(wuNum/partyMemberNum).setScale(2));
+ statisticsOrgVo.setWuNumPercent(new BigDecimal(wuNum)
+ .divide(new BigDecimal(partyMemberNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
}
Integer participateActivityNum = statisticsOrgVo.getParticipateActivityNum();
if (nonNull(participateActivityNum) && participateActivityNum.intValue() > 0) {
Integer participateVolunteerActivityNum = statisticsOrgVo.getParticipateVolunteerActivityNum();
if (nonNull(participateVolunteerActivityNum) && participateVolunteerActivityNum.intValue() > 0) {
- statisticsOrgVo.setParticipateVolunteerActivityNumPercent(new BigDecimal(participateVolunteerActivityNum/participateActivityNum).setScale(2));
+ statisticsOrgVo.setParticipateVolunteerActivityNumPercent(new BigDecimal(participateVolunteerActivityNum)
+ .divide(new BigDecimal(participateActivityNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer participatePartyActivityNum = statisticsOrgVo.getParticipatePartyActivityNum();
if (nonNull(participatePartyActivityNum) && participatePartyActivityNum.intValue() > 0) {
- statisticsOrgVo.setParticipatePartyActivityNumPercent(new BigDecimal(participatePartyActivityNum/participateActivityNum).setScale(2));
+ statisticsOrgVo.setParticipatePartyActivityNumPercent(new BigDecimal(participatePartyActivityNum)
+ .divide(new BigDecimal(participateActivityNum), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
}
Integer participateActivityDuration = statisticsOrgVo.getParticipateActivityDuration();
if (nonNull(participateActivityDuration) && participateActivityDuration.intValue() > 0) {
Integer participateVolunteerActivityDuration = statisticsOrgVo.getParticipateVolunteerActivityDuration();
if (nonNull(participateVolunteerActivityDuration) && participateVolunteerActivityDuration.intValue() > 0) {
- statisticsOrgVo.setParticipateVolunteerActivityDurationPercent(new BigDecimal(participateVolunteerActivityDuration/participateActivityDuration).setScale(2));
+ statisticsOrgVo.setParticipateVolunteerActivityDurationPercent(new BigDecimal(participateVolunteerActivityDuration)
+ .divide(new BigDecimal(participateActivityDuration), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
Integer participatePartyActivityDuration = statisticsOrgVo.getParticipatePartyActivityDuration();
if (nonNull(participatePartyActivityDuration) && participatePartyActivityDuration.intValue() > 0) {
- statisticsOrgVo.setParticipatePartyActivityDurationPercent(new BigDecimal(participatePartyActivityDuration/participateActivityDuration).setScale(2));
+ statisticsOrgVo.setParticipatePartyActivityDurationPercent(new BigDecimal(participatePartyActivityDuration)
+ .divide(new BigDecimal(participateActivityDuration), 2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100)).setScale(0));
}
}
return R.ok(statisticsOrgVo);
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml
index 1c8cf5c..0392aed 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/ComPbOrgMapper.xml
@@ -106,6 +106,7 @@
and cpo.build_id = #{partyOrganizationVO.buildId}
</if>
</where>
+ GROUP BY cpo.id
ORDER BY cpo.id desc
</select>
--
Gitblit v1.7.1