|
@@ -165,7 +165,8 @@ public class ComDisplayController {
|
|
|
//查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量 X 100%
|
|
|
item.setIntakeWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水源", 4, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
item.setYieldWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水厂", 3, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
- item.setWaterFeeRecoveryRate(Double.valueOf(Math.round(((receFee.get(0).getYieldWaterUsage() - waterUsage) / receFee.get(0).getYieldWaterUsage()) * 100)));
|
|
|
+
|
|
|
+ item.setWaterFeeRecoveryRate(Double.valueOf(Math.round(((item.getYieldWaterUsage() - waterUsage) / item.getYieldWaterUsage()) * 100)));
|
|
|
}
|
|
|
return new AjaxMessage<>(ResultStatus.OK, receFee);
|
|
|
}
|