App总览-营业数据-营收实收

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

@@ -175,7 +175,6 @@ public class AppPageReportController {
         return new AjaxMessage<>(ResultStatus.OK,map);
     }
 
-
     /**
      * @Author wangbo
      * @Description App 营业总览数据-本月应收实收回收率数据
@@ -221,7 +220,6 @@ public class AppPageReportController {
         return new AjaxMessage<>(ResultStatus.OK,map);
     }
 
-
     /**
      * @Author wangbo
      * @Description App 营业总览数据-近一年应收实收回收率数据
@@ -232,9 +230,8 @@ public class AppPageReportController {
     @ApiOperation(value = "App总览——营业总览应收实收回收率数据(近一年)")
     public AjaxMessage<Map<String,Object>> getBusinessDataForLast12Month(
             @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId){
-        LocalDate now = LocalDate.now();
         Map<String,Object> map = new HashMap<String,Object>();
-        List<DeviceWaterSupply> sellerWaterList = appPageReportService.deviceSellerAmountReportForMonth(companyOrgId,now.getMonthValue());
+        List<DeviceWaterSupply> sellerWaterList = appPageReportService.deviceSellerAmountReportForMonth(companyOrgId,12);
         BigDecimal totalReceivableAmount = new BigDecimal(0);
         BigDecimal totalReceivedAmount = new BigDecimal(0);
         for(DeviceWaterSupply amount: sellerWaterList){