Bläddra i källkod

综合展示-二供保留3位小数

yuejiaying 4 år sedan
förälder
incheckning
5a24b0bfce

+ 0 - 3
sms_water/src/main/java/com/huaxu/controller/ComDisplayController.java

@@ -135,9 +135,6 @@ public class ComDisplayController {
         monitorDataCollectDto.setSceneTypeName("泵站");
         monitorDataCollectDto.setSceneIds(sceneService.findByParentIdsByCom(null));
         List<SecDataCollectDto> result = onlineMonitorService.selectMapForWholeCompany(monitorDataCollectDto);
-        for (SecDataCollectDto item : result) {
-            item.setYieldWaterUsage(item.getYieldWaterUsage() != null ? (double) Math.round(item.getYieldWaterUsage() / (float) 100) / 100 : null);
-        }
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
     @RequestMapping(value="selectMapForCompany" , method = RequestMethod.GET)

+ 1 - 1
sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -502,7 +502,7 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                     secDataCollectDto.setCount(1);
                     secDataCollectDto.setComName(orgInfoUtil.getOrgName(item.getCompanyOrgId().intValue()));
                     BigDecimal yieldWaterUsage=monitorDataReportServiceImpl.getAmountCount(item.getCompanyOrgId().intValue(),null,"泵站",3,2);
-                    secDataCollectDto.setYieldWaterUsage(yieldWaterUsage.doubleValue());
+                    secDataCollectDto.setYieldWaterUsage(yieldWaterUsage.doubleValue()/10000);
                     map.put(item.getCompanyOrgId(), secDataCollectDto);
                 } else {
                     Integer count = map.get(item.getCompanyOrgId()).getCount() != null ? map.get(item.getCompanyOrgId()).getCount() : 1;