综合分析报表，万元占比、按月统计用能报表不考虑期末余油的计算

src/main/java/com/hb/proj/car/controller/EnergyWaterCompareController.java

@@ -129,8 +129,8 @@ public class EnergyWaterCompareController {
 		WpgCorrect wpgcrt=service.wpgCorrectMonthSum(startMonth,endMonth);
 		wpg=ERPKlSumUtil.processWpgSum(wpg,wpgcrt);
 		CarConsumeMulRptVO consume=service.carOilMonthSum(startMonth, endMonth);
-		MonitorRemainOil remainOil=service.carOilPeriodDiff(startMonth, endMonth);
-		consume.adjust(remainOil);
+		//MonitorRemainOil remainOil=service.carOilPeriodDiff(startMonth, endMonth);  //2022.7.20 不考虑期末余油的计算
+		//consume.adjust(remainOil);
 		return new EnergyWaterRatioCompareVO(erp,wpg,service.workloadMonthSum(startMonth,endMonth),consume);
 		
 	}

src/main/java/com/hb/proj/car/controller/HomeRptController.java

@@ -23,7 +23,6 @@ import com.hb.proj.model.ERP;
 import com.hb.proj.model.EnergyWaterCompareVO;
 import com.hb.proj.model.EnergyWaterSumVO;
 import com.hb.proj.model.EnergyWaterSumVOUtil;
-import com.hb.proj.model.MonitorRemainOil;
 import com.hb.proj.model.OtherConsume;
 import com.hb.proj.model.Workload;
 import com.hb.proj.model.Wpg;
@@ -269,7 +268,7 @@ public class HomeRptController {
 	
 	
 	/**
-	 * 首页按月统计能源，水消耗量
+	 * 首页按月统计能源，水消耗量,2022.7.18  增加新指标计算，2022.7.20 不考虑期末余油的计算
 	 * @param request
 	 * @param response
 	 */
@@ -281,8 +280,8 @@ public class HomeRptController {
 		}
 		Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
 		List<CarConsumeMulRptVO> indConsumes=service.carOilMulRptMonthGrp(year);
-		List<MonitorRemainOil> remainOils=service.carOilPeriodDiffMonthGrp(year);
-		EnergyWaterSumVOUtil.attachForMulRpt(voIndex, indConsumes,remainOils);
+		//List<MonitorRemainOil> remainOils=service.carOilPeriodDiffMonthGrp(year);
+		EnergyWaterSumVOUtil.attachForMulRpt(voIndex, indConsumes,null);
 		
 		if("chart".equals(type)){
 			//Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);

src/main/webapp/page/rpt/tmp/carOilCostDtl.ftl

@@ -5,7 +5,7 @@
 </div>
 <style>
 .rpttab-cell-0{width:40px;}
-.rpttab-cell-1{width:70px;}
+.rpttab-cell-1{width:90px;}
 .rpttab-cell-2{width:120px;}
 .rpttab-cell-3{width:330px;}
 .rpttab-cell-4{width:80px;}

src/main/webapp/page/rpt/tmp/carOilCostDtlSafeDpt.ftl

@@ -4,7 +4,7 @@
 </div>
 <style>
 .rpttab-cell-0{width:40px;}
-.rpttab-cell-1{width:70px;}
+.rpttab-cell-1{width:90px;}
 .rpttab-cell-2{width:150px;}
 .rpttab-cell-3{width:120px;}
 .rpttab-cell-4{width:330px;}