修改

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

@@ -370,32 +370,50 @@ public class AppPageReportController {
     @RequestMapping(value = "getSceneAmountForSameMonth",method = RequestMethod.GET)
     @ApiOperation(value = "App总览——资产情况本月")
     public AjaxMessage<Object> getSceneAmountForSameMonth(@ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Long companyOrgId){
-        Map<String,Object> map = new HashMap<String,Object>();
+
         List<Map<String,Object>> amount = appPageReportService.findSceneAmount(companyOrgId,1);
-        map.put("bigmeter","-");
-        map.put("generalmeter","-");
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("amount","-");
+        map.put("sceneTypeName","大用户");
         amount.add(map);
+
+        Map<String,Object> map2 = new HashMap<String,Object>();
+        map2.put("amount","-");
+        map2.put("sceneTypeName","户表");
+        amount.add(map2);
         return new AjaxMessage<>(ResultStatus.OK,amount);
     }
 
     @RequestMapping(value = "getSceneAmountForSameYear",method = RequestMethod.GET)
     @ApiOperation(value = "App总览——资产情况本年")
     public AjaxMessage<Object> getSceneAmountForSameYear(@ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Long companyOrgId){
-        Map<String,Object> map = new HashMap<String,Object>();
         LocalDate now = LocalDate.now();
         List<Map<String,Object>> amount = appPageReportService.findSceneAmount(companyOrgId,now.getMonthValue());
-        map.put("bigmeter","-");
-        map.put("generalmeter","-");
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("amount","-");
+        map.put("sceneTypeName","大用户");
+        amount.add(map);
+
+        Map<String,Object> map2 = new HashMap<String,Object>();
+        map2.put("amount","-");
+        map2.put("sceneTypeName","户表");
+        amount.add(map2);
         return new AjaxMessage<>(ResultStatus.OK,amount);
     }
 
     @RequestMapping(value = "getSceneAmountForLast12Month",method = RequestMethod.GET)
     @ApiOperation(value = "App总览——资产情况近一年")
     public AjaxMessage<Object> getSceneAmountForLast12Month(@ApiParam(value = "公司id,总公司传空值") @RequestParam(required = false) Long companyOrgId){
-        Map<String,Object> map = new HashMap<String,Object>();
         List<Map<String,Object>> amount = appPageReportService.findSceneAmount(companyOrgId,12);
-        map.put("bigmeter","-");
-        map.put("generalmeter","-");
+        Map<String,Object> map = new HashMap<String,Object>();
+        map.put("amount","-");
+        map.put("sceneTypeName","大用户");
+        amount.add(map);
+
+        Map<String,Object> map2 = new HashMap<String,Object>();
+        map2.put("amount","-");
+        map2.put("sceneTypeName","户表");
+        amount.add(map2);
         return new AjaxMessage<>(ResultStatus.OK,amount);
     }
 }