|
@@ -126,7 +126,7 @@ public class SsBbMonthServiceImpl extends ServiceImpl<SsBbMonthMapper, SsBbMonth
|
|
|
BigDecimal totalSewageTreatment = monthGroupMap.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
|
|
|
- BigDecimal totalAccountedRate = bigDecimal.divide(totalSewageTreatment, 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100));
|
|
|
+ BigDecimal totalAccountedRate = bigDecimal.divide(totalSewageTreatment, 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
productionStatisticsVo.setTotalSewLastMonth(bigDecimal);
|
|
|
productionStatisticsVo.setTotalSewageTreatment(totalSewageTreatment);
|
|
@@ -155,11 +155,11 @@ public class SsBbMonthServiceImpl extends ServiceImpl<SsBbMonthMapper, SsBbMonth
|
|
|
BigDecimal begin = beginBigDecimal.get();
|
|
|
BigDecimal decimal = BigDecimal.ZERO;
|
|
|
if (!BigDecimal.ZERO.equals(begin)) {
|
|
|
- decimal = (lost.subtract(begin)).divide(begin, 2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ decimal = (lost.subtract(begin)).divide(begin, 4, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
|
|
|
|
|
|
- return decimal.multiply(BigDecimal.valueOf(100));
|
|
|
+ return decimal.multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -194,7 +194,7 @@ public class SsBbMonthServiceImpl extends ServiceImpl<SsBbMonthMapper, SsBbMonth
|
|
|
informationVo.setDealWaterSupply(dealWaterSupply.get());
|
|
|
informationVo.setTotalDissipatedPower(totalDissipatedPower.get());
|
|
|
|
|
|
- informationVo.setDbl(BigDecimal.valueOf(standard.get()).divide(BigDecimal.valueOf(normal.get()), 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)));
|
|
|
+ informationVo.setDbl(BigDecimal.valueOf(standard.get()).divide(BigDecimal.valueOf(normal.get()), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
|
|
|
return informationVo;
|
|
|
}
|
|
@@ -256,7 +256,7 @@ public class SsBbMonthServiceImpl extends ServiceImpl<SsBbMonthMapper, SsBbMonth
|
|
|
Integer dbpfts = saveDbpfts.get(k);
|
|
|
Integer zcyxts = saveZcyxts.get(k);
|
|
|
vo.setUmonth(k);
|
|
|
- vo.setDbl(BigDecimal.valueOf(dbpfts).divide(BigDecimal.valueOf(zcyxts), 2, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)));
|
|
|
+ vo.setDbl(BigDecimal.valueOf(dbpfts).divide(BigDecimal.valueOf(zcyxts), 4, BigDecimal.ROUND_HALF_UP).multiply(BigDecimal.valueOf(100)).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
waterQualityJuneInfoVoList.add(vo);
|
|
|
});
|
|
|
|