Merge remote-tracking branch 'origin/20210223' into 20210223

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

@@ -40,14 +40,14 @@ public class HomePageReportController {
     @RequestMapping(value = "getDeviceWaterIntake",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——取水图表(近6月)")
     public AjaxMessage<List<DeviceWaterSupply>> getDeviceWaterIntake(
-            @ApiParam(value = "公司id,总公司传空值") Integer companyOrgId){
+            @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId){
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.deviceWaterReportForSixMonth(companyOrgId,"水源",4));
     }
 
     @RequestMapping(value = "getDeviceWaterMaking",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——制水图表(近6月)")
     public AjaxMessage<List<DeviceWaterSupply>> getDeviceWaterMaking(
-            @ApiParam(value = "公司id,总公司传空值") Integer companyOrgId
+            @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId
     ){
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.deviceWaterReportForSixMonth(companyOrgId,"水厂",3));
     }
@@ -56,21 +56,21 @@ public class HomePageReportController {
     @RequestMapping(value = "getCompanyResouces",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——公司资源统计")
     public AjaxMessage<CompanyCount> getCompanyResouces(
-            @ApiParam(value = "公司id,总公司传空值") Integer companyOrgId){
+            @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId){
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.countSceneByType(companyOrgId));
     }
 
     @RequestMapping(value = "getDeviceWaterAmount",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——生产经营（制水售水）统计")
     public AjaxMessage<CompanyProduce> getDeviceWaterAmount(
-            @ApiParam(value = "公司id,总公司传空值") Integer companyOrgId){
+            @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false)  Integer companyOrgId){
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.deviceWaterAmount(companyOrgId));
     }
 
     @RequestMapping(value = "getWaterQualification",method = RequestMethod.GET)
     @ApiOperation(value = "综合展示——水质安全")
     public AjaxMessage<WaterQualityRate> getWaterQualification(
-            @ApiParam(value = "公司id,总公司传空值") Integer companyOrgId){
+            @ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId){
         return new AjaxMessage<>(ResultStatus.OK,homePageReportService.getWaterQualification(companyOrgId));
     }