|
@@ -85,7 +85,7 @@ public class AppPageReportController {
|
|
|
public AjaxMessage<Map<String,Object>> getProductionDataFor12Month(
|
|
|
@ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Integer companyOrgId){
|
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
|
- List<DeviceWaterSupply> supplyWaterList = appPageReportService.deviceWaterReportForMonth(companyOrgId,"水源",4,12)
|
|
|
+ List<DeviceWaterSupply> supplyWaterList = appPageReportService.deviceWaterReportForMonth(companyOrgId,"水源",4,12);
|
|
|
List<DeviceWaterSupply> makingWaterList = appPageReportService.deviceWaterReportForMonth(companyOrgId,"水厂",3,12);
|
|
|
List<DeviceWaterSupply> sellerWaterList = appPageReportService.deviceSellerWaterReportForMonth(companyOrgId,12);
|
|
|
map.put("取水量", supplyWaterList);
|