Merge remote-tracking branch 'origin/master' into master

@@ -105,11 +105,11 @@ public class ReportItemvService {
      //   long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
      //   long lastYearDifferDay = DateUtils.differenceDay(dateVO.getLastYearMonthStartTime(),dateVO.getLastYearMonthEndTime());
 
 
         //当月数据/环比、同比
         //当月数据/环比、同比
-        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总电耗(", JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueHb(),10000),  JSUtils.divide(dlhjData.getValueTb(),10000));
+        FRportlCommandCenterVO  nowMonthVO = new FRportlCommandCenterVO("月总电耗(", JSUtils.divide(dlhjData.getValue(),10000), JSUtils.divide(dlhjData.getValueTb(),10000), JSUtils.divide(dlhjData.getValueHb(),10000));
         //日均数据：/环比/同比
         //日均数据：/环比/同比
-        FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("日均电耗",dlhj_avg_value ,dlhj_avg_valueHB,dlhj_avg_valueTB );
+        FRportlCommandCenterVO  lastMonthVO = new FRportlCommandCenterVO("日均电耗",dlhj_avg_value ,JSUtils.divide(dlhj_avg_valueTB,10000)  ,JSUtils.divide(dlhj_avg_valueHB,10000));
         //吨水消耗
         //吨水消耗
-        FRportlCommandCenterVO  lastYearVo = new FRportlCommandCenterVO("吨水电耗",dsdh_value ,dsdh_value_Hb ,dsdh_value_Tb);
+        FRportlCommandCenterVO  lastYearVo = new FRportlCommandCenterVO("吨水电耗",dsdh_value ,dsdh_value_Tb,dsdh_value_Hb );
         fRportlCommandCenterVOList.add( nowMonthVO) ;
         fRportlCommandCenterVOList.add( nowMonthVO) ;
         fRportlCommandCenterVOList.add( lastMonthVO) ;
         fRportlCommandCenterVOList.add( lastMonthVO) ;
         fRportlCommandCenterVOList.add( lastYearVo) ;
         fRportlCommandCenterVOList.add( lastYearVo) ;