fix(module-biz): 修复指挥中心数据统计错误

- 修正了上月数据查询的起止时间
- 调整了同比和环比数据的计算顺序- 优化了代码格式，提高了可读性

@@ -77,7 +77,7 @@ public class SysCommandCentreController {
         //本月数据
         String monthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
         //环比 上月数据
-        String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getNowMonthStartDate(), dateVO.getNowMonthEndDate());
+        String lastMonthCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastMonthStartTime(), dateVO.getLastMonthEndTime());
         //同比 去年数据
         String lastYearCSL = reportItemvService.getSumCSL(departIds, dateVO.getLastYearMonthStartTime(), dateVO.getLastYearMonthEndTime());
 
@@ -85,11 +85,11 @@ public class SysCommandCentreController {
         long lastMonthDifferDay = DateUtils.differenceDay(dateVO.getLastMonthStartTime(),dateVO.getLastMonthEndTime());
         long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
         //月对象数据 value, valueTb, valueHb
-        FRportlCommandCenterVO  monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastMonthCSL,10000),JSUtils.divide(lastYearCSL,10000));
+        FRportlCommandCenterVO monthDataVO = new FRportlCommandCenterVO("月汇总数据",JSUtils.divide(monthCSL,10000),JSUtils.divide(lastYearCSL,10000),JSUtils.divide(lastMonthCSL,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 );
+        FRportlCommandCenterVO avgDayDataVO = new FRportlCommandCenterVO("日均处理水量",JSUtils.divide(monthCSL,nowDifferDay*10000),JSUtils.divide(lastYearCSL,lastYearDifferDay*10000),JSUtils.divide(lastMonthCSL,lastMonthDifferDay*10000));
+        fReportItemvList.add(monthDataVO);
+        fReportItemvList.add(avgDayDataVO);
 
         //年数据统计：
         String total = factoryInfoService.querySumProScale( JSUtils.quoteEach(departIds,",") );