综合展示地图详情

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

@@ -147,25 +147,25 @@ public class ComDisplayController {
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
 
-    @RequestMapping(value="selectMapDataForCompany" , method = RequestMethod.GET)
-    @ApiOperation(value = "综合展示--地图详细信息展示")
-    public AjaxMessage<List<ComdisplayInfoDto>> selectMapDataForCompany() {
-        List<ComdisplayInfoDto> receFee = comdisplayMapLocationService.selectMapDataForCompany();
-        for (ComdisplayInfoDto item : receFee) {
-            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
-            Double waterUsage = item.getWaterUsage() != null ? item.getWaterUsage() : 0d;//售水量
-            //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
-            //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
-            item.setIntakeWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水源", 4, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-            item.setYieldWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水厂", 3, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
-
-            receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(item.getYieldWaterUsage()-waterUsage).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+//    @RequestMapping(value="selectMapDataForCompany" , method = RequestMethod.GET)
+//    @ApiOperation(value = "综合展示--地图详细信息展示")
+//    public AjaxMessage<List<ComdisplayInfoDto>> selectMapDataForCompany() {
+//        List<ComdisplayInfoDto> receFee = comdisplayMapLocationService.selectMapDataForCompany();
+//        for (ComdisplayInfoDto item : receFee) {
+//            item.setCompanyOrgName(orgInfoUtil.getOrgName(item.getCompanyOrgId()));
+//            Double waterUsage = item.getWaterUsage() != null ? item.getWaterUsage() : 0d;//售水量
+//            //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
+//            //查询子公司的取水量、制水量 产销差(制水量-售水量)/制水量  X 100%
+//            item.setIntakeWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水源", 4, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+//            item.setYieldWaterUsage(monitorDataReportService.getAmountCount(item.getCompanyOrgId(), null, "水厂", 3, 2).divide(new BigDecimal("10000"),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+//
+//            receFee.get(0).setWaterFeeRecoveryRate(BigDecimal.valueOf(item.getYieldWaterUsage()-waterUsage).divide(BigDecimal.valueOf(receFee.get(0).getYieldWaterUsage()),3,BigDecimal.ROUND_HALF_UP).doubleValue());
+//
+//        }
+//        return new AjaxMessage<>(ResultStatus.OK, receFee);
+//    }
 
-        }
-        return new AjaxMessage<>(ResultStatus.OK, receFee);
-    }
-
-    @RequestMapping(value="selectMapDataForSingleCompany" , method = RequestMethod.GET)
+    @RequestMapping(value="selectMapDataForCompany" , method = RequestMethod.GET)
     @ApiOperation(value = "综合展示--地图详细信息展示(按子公司查询)")
     public AjaxMessage<ComdisplayInfoDto> selectMapDataForSinggleCompany(@RequestParam(required = true) Integer companyOrgId) {
         List<ComdisplayInfoDto> receFee = comdisplayMapLocationService.selectMapDataForSingleCompany(companyOrgId);