节能环保问题修改

@@ -69,11 +69,11 @@ public class SysCommandCentreController {
         long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
         long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
         long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
         long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
         //月对象数据String value, String valueTb, String valueHb
         //月对象数据String value, String valueTb, String valueHb
-        FRportlCommandCenterVO  monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.format(monthCSL),JSUtils.format(lastMonthCSL),JSUtils.format(lastYearCSL));
+        FRportlCommandCenterVO  monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastMonthCSL,10000),JSUtils.divide(lastYearCSL,10000));
         //日处理对象
         //日处理对象
         FRportlCommandCenterVO  avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000));
         FRportlCommandCenterVO  avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000));
-        fReportItemvList.add( monthDataVO) ;
-        fReportItemvList.add( avgDayDataVO ) ;
+        fReportItemvList.add( monthDataVO);
+        fReportItemvList.add( avgDayDataVO );
 
 
         //年数据统计：
         //年数据统计：
         String total = factoryInfoService.querySumProScale();
         String total = factoryInfoService.querySumProScale();
@@ -98,10 +98,6 @@ public class SysCommandCentreController {
         String startTime = reportItemvParam.getStartDate();
         String startTime = reportItemvParam.getStartDate();
         String endTime = reportItemvParam.getEndDate();
         String endTime = reportItemvParam.getEndDate();
         String  dataViewName2119 = ReportViewUtil.buildView(ReportViewUtil.view2119,"CSL", departId, startTime,endTime);// 部门、时间
         String  dataViewName2119 = ReportViewUtil.buildView(ReportViewUtil.view2119,"CSL", departId, startTime,endTime);// 部门、时间
-
-
-
-
         //报表数据项值
         //报表数据项值
         String reitId = sysConfigService.queryValueByKey("REIT_ID_CSL");
         String reitId = sysConfigService.queryValueByKey("REIT_ID_CSL");
 
 
@@ -131,9 +127,6 @@ public class SysCommandCentreController {
         return  result;
         return  result;
     }
     }
 
 
-
-
-
     //cement水泥  electricity
     //cement水泥  electricity
     @AutoLog(value = "指挥中心-泥量统计")
     @AutoLog(value = "指挥中心-泥量统计")
     @ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计")
     @ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计")
@@ -144,8 +137,6 @@ public class SysCommandCentreController {
         //SysAlgorithmStatisticsLibraryVO sysAlgorithmLibraryVO = JSONObject.toJavaObject(jsonObject, SysAlgorithmStatisticsLibraryVO.class);
         //SysAlgorithmStatisticsLibraryVO sysAlgorithmLibraryVO = JSONObject.toJavaObject(jsonObject, SysAlgorithmStatisticsLibraryVO.class);
         //String reportId  = "3a243d5715b9e1a3753c180872ca0df9";//报表编号
         //String reportId  = "3a243d5715b9e1a3753c180872ca0df9";//报表编号
         //String reportItemCode = "WNL";//查询字段
         //String reportItemCode = "WNL";//查询字段
-
-
         //报表数据项值
         //报表数据项值
         String reitId = sysConfigService.queryValueByKey("REIT_ID_WNL");
         String reitId = sysConfigService.queryValueByKey("REIT_ID_WNL");
        // reportItemvParam.setReportItemCode(reportItemCode);
        // reportItemvParam.setReportItemCode(reportItemCode);