diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 07d18fdc20..30afda20ef 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -142,10 +142,10 @@ public class IndexServiceImpl implements IndexService { barchart.setGovernAbility(getRound(barchart.getGovernAbility())); barchart.setServiceAbility(getRound(barchart.getServiceAbility())); barchart.setIndexTotal(getRound(barchart.getPartyDevAbility() + barchart.getGovernAbility() + barchart.getServiceAbility())); - //去除末尾0 - barchart.setServiceAblityWeight(new BigDecimal(barchart.getServiceAblityWeight().stripTrailingZeros().toPlainString())); - barchart.setPartyDevWeight(new BigDecimal(barchart.getPartyDevWeight().stripTrailingZeros().toPlainString())); - barchart.setGovernAblityWeight(new BigDecimal(barchart.getGovernAblityWeight().stripTrailingZeros().toPlainString())); + //四舍五入,保留小数点后两位 + barchart.setServiceAblityWeight(barchart.getServiceAblityWeight().setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP)); + barchart.setPartyDevWeight(barchart.getPartyDevWeight().setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP)); + barchart.setGovernAblityWeight(barchart.getGovernAblityWeight().setScale(NumConstant.TWO,BigDecimal.ROUND_HALF_UP)); }); List collect = monthBarchartResults.stream().sorted(Comparator.comparing(MonthBarchartResult::getMonthId)).collect(Collectors.toList()); //升序 当前月份在队尾