|
@@ -64,7 +64,7 @@ public class AppDataService {
|
|
|
break;
|
|
|
case "售水":
|
|
|
appSmsDataDto.setYieldWaterUsage(monitorDataReportService.getAmountCount(null, null, "水厂", 3, 2).divide(BigDecimal.valueOf(10000)).setScale(3, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
- appSmsDataDto.setWaterUsage(monitorDataReportService.getUseAmount(null, 1).divide(BigDecimal.valueOf(10000),3,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
+ appSmsDataDto.setWaterUsage(monitorDataReportService.getUseAmount(null, 1).setScale(3,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
double amount = appSmsDataDto.getYieldWaterUsage() - appSmsDataDto.getWaterUsage();
|
|
|
if (appSmsDataDto.getYieldWaterUsage() != null && appSmsDataDto.getYieldWaterUsage() != 0d) {
|
|
|
appSmsDataDto.setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).divide(BigDecimal.valueOf(appSmsDataDto.getYieldWaterUsage()), 3, BigDecimal.ROUND_HALF_UP).doubleValue() * 100);
|