App总览-营业数据-环比

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

@@ -231,6 +231,7 @@ public class AppPageReportController {
             totalReceivedAmount=totalReceivedAmount.add(amount.getReceivedAmount());
             totalGeneralUser=totalGeneralUser.add(amount.getGeneralUserAmount());
             totalBigUser=totalBigUser.add(amount.getBigUserAmount());
+            amount.setRecoveryRate(totalReceivableAmount.compareTo(BigDecimal.ZERO)==0? BigDecimal.ZERO : totalReceivedAmount.multiply(new BigDecimal(100)).divide(totalReceivableAmount,2));
         }
         BigDecimal sum =totalBigUser.add(totalGeneralUser);
         BigDecimal generalRate =sum.compareTo(BigDecimal.ZERO)==0?BigDecimal.ZERO:totalGeneralUser.multiply(new BigDecimal(100)).divide(sum,2);

sms_water/src/main/java/com/huaxu/dto/generalView/DeviceWaterSupply.java

@@ -43,6 +43,9 @@ public class DeviceWaterSupply implements Serializable {
     @ApiModelProperty("大客户用量")
     @JsonSerialize(using = BigDecimalJsonSerializer.class)
     private BigDecimal bigUserAmount = BigDecimal.ZERO;
+    @ApiModelProperty("回收率")
+    @JsonSerialize(using = BigDecimalJsonSerializer.class)
+    private BigDecimal recoveryRate = BigDecimal.ZERO;
     @ApiModelProperty("日期")
     private LocalDate date;
     @ApiModelProperty("日期格式化")