综合展示地图详情

sms_water/src/main/java/com/huaxu/controller/ComDisplayController.java

@@ -166,7 +166,8 @@ public class ComDisplayController {
             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(((item.getYieldWaterUsage() - waterUsage) / item.getYieldWaterUsage()) * 100)));
+            receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(item.getYieldWaterUsage()-waterUsage).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+
         }
         return new AjaxMessage<>(ResultStatus.OK, receFee);
     }
@@ -179,9 +180,10 @@ public class ComDisplayController {
             receFee.get(0).setCompanyOrgName(orgInfoUtil.getOrgName(receFee.get(0).getCompanyOrgId()));
             Double waterUsage = receFee.get(0).getWaterUsage() != null ? receFee.get(0).getWaterUsage() : 0d;//售水量
             //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
-            receFee.get(0).setIntakeWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水源", 4, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-            receFee.get(0).setYieldWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水厂", 3, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-            receFee.get(0).setWaterFeeRecoveryRate(Double.valueOf(Math.round(((receFee.get(0).getYieldWaterUsage() - waterUsage) / receFee.get(0).getYieldWaterUsage()) * 100)));
+            receFee.get(0).setIntakeWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水源", 4, 2).divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
+            receFee.get(0).setYieldWaterUsage(monitorDataReportService.getAmountCount(companyOrgId, null, "水厂", 3, 2).divide(new BigDecimal("10000"), 3, BigDecimal.ROUND_HALF_UP).doubleValue());
+            double amount = receFee.get(0).getYieldWaterUsage() - waterUsage;
+            receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(amount).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()),3,BigDecimal.ROUND_HALF_UP).doubleValue());
         }
         return new AjaxMessage<>(ResultStatus.OK, receFee.get(0));
     }

sms_water/src/main/java/com/huaxu/dto/ComdisplayInfoDto.java

@@ -34,7 +34,6 @@ public class ComdisplayInfoDto {
     @ApiModelProperty(value = "售水量")
     private Double waterUsage;
 
-    @JsonSerialize(using = Double1Serializer.class)
     @ApiModelProperty(value = "产销差")
     private Double waterFeeRecoveryRate;