综合分析报表中的，万元占比报表，用能用水按月统计报表增加新的统计项

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

@@ -16,7 +16,7 @@ import com.hb.proj.car.service.EnergySumRptService;
 import com.hb.proj.car.service.MaterialERPService;
 import com.hb.proj.car.service.YearSumCompareService;
 import com.hb.proj.input.service.WorkloadService;
-import com.hb.proj.model.CarConsume;
+import com.hb.proj.model.CarConsumeMulRptVO;
 import com.hb.proj.model.ERP;
 import com.hb.proj.model.EnergyWaterCompareVO;
 import com.hb.proj.model.EnergyWaterRatioCompareVO;
@@ -127,8 +127,8 @@ public class EnergyWaterCompareController {
 		Wpg wpg=service.wpgMonthSum(startMonth,endMonth);
 		WpgCorrect wpgcrt=service.wpgCorrectMonthSum(startMonth,endMonth);
 		wpg=ERPKlSumUtil.processWpgSum(wpg,wpgcrt);
-		CarConsume consume=service.carOilMonthSum(startMonth, endMonth);
-		return new EnergyWaterRatioCompareVO(erp,wpg,service.workloadMonthSum(startMonth,endMonth),consume!=null?consume.getCheckMile():null);
+		CarConsumeMulRptVO consume=service.carOilMonthSum(startMonth, endMonth);
+		return new EnergyWaterRatioCompareVO(erp,wpg,service.workloadMonthSum(startMonth,endMonth),consume);
 		
 	}
 	

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

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import com.hb.proj.car.service.EnergySumRptService;
 import com.hb.proj.car.service.MaterialERPService;
 import com.hb.proj.car.service.YearSumCompareService;
+import com.hb.proj.model.CarConsumeMulRptVO;
 import com.hb.proj.model.ERP;
 import com.hb.proj.model.EnergyWaterCompareVO;
 import com.hb.proj.model.EnergyWaterSumVO;
@@ -292,6 +293,8 @@ public class HomeRptController {
 			mths.add(perMth);
 		}
 		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);
+		EnergyWaterSumVOUtil.attachForMulRpt(voIndex, indConsumes);
 		
 		Map<String,Object> rootMap=new HashMap<String,Object>();
 		rootMap.put("months", mths); 

src/main/java/com/hb/proj/car/service/CarRptUtils.java

@@ -269,6 +269,18 @@ public class CarRptUtils {
 		}
 	}
 	
+	public static Double reduceDouble(Double d1,Double d2){
+		if(d2==null||Double.isNaN(d2)){
+			return d1;
+		}
+		if(d1==null||Double.isNaN(d1)){
+			return d2!=null?(-1*d2.doubleValue()):null;
+		}
+		else{
+			return d1.doubleValue()-d2.doubleValue();
+		}
+	}
+	
 	public static Integer addInteger(Integer t1,Integer t2){
 		if(t2==null){
 			return t1;
@@ -282,4 +294,5 @@ public class CarRptUtils {
 		return t1;
 	}
 	
+	
 }

src/main/java/com/hb/proj/car/service/EnergySumRptService.java

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.hb.proj.model.CarConsume;
+import com.hb.proj.model.CarConsumeMulRptVO;
 import com.hb.proj.model.ERP;
 import com.hb.proj.model.OtherConsume;
 import com.hb.proj.model.Workload;
@@ -26,13 +27,34 @@ public class EnergySumRptService {
 	@Autowired
 	private SpringJdbcDAO  dao;
 	
-	public CarConsume carOilMonthSum(String startMonth,String endMonth){
+	public CarConsumeMulRptVO carOilMonthSum(String startMonth,String endMonth){
 		StringBuilder sql=new StringBuilder();
-		sql.append("select sum(check_mile) check_mile");
+		sql.append("select sum(check_mile) check_mile,sum(case when r.oil_type='柴油' then ifnull(travel_mile,0) else 0 end) coil_travel_mile,");
+		sql.append("sum(case when r.oil_type='汽油' then ifnull(travel_mile,0) else 0 end) oil_travel_mile,");
+		sql.append("sum(ifnull(oil_erp,0)+ifnull(oil_kl,0)) oil_us_liter,");
+		sql.append("sum(ifnull(coil_erp,0)+ifnull(coil_kl,0)) coil_us_liter,");
+		sql.append("sum(ifnull(work_cost,0)) work_us_liter,sum(ifnull(engine_cost,0)) engine_us_liter");
 		sql.append(" from t_car_consume s");
 		sql.append(" inner join t_car c on s.car_id=c.car_id");
+		sql.append(" inner join t_quota_rule r on c.quota_rule_id=r.record_id");
 		sql.append(" where DATE_FORMAT(s.rpt_date,'%Y-%m')  between ?  and ? ");
-		return dao.queryForObject(sql.toString(), CarConsume.class,startMonth,endMonth);
+		return dao.queryForObject(sql.toString(), CarConsumeMulRptVO.class,startMonth,endMonth);
+	}
+	
+	
+	public List<CarConsumeMulRptVO> carOilMulRptMonthGrp(String year){
+		StringBuilder sql=new StringBuilder();
+		sql.append("select DATE_FORMAT(s.rpt_date,'%Y-%m') rpt_month,sum(case when r.oil_type='柴油' then ifnull(travel_mile,0) else 0 end) coil_travel_mile,");
+		sql.append("sum(case when r.oil_type='汽油' then ifnull(travel_mile,0) else 0 end) oil_travel_mile,");
+		sql.append("sum(ifnull(oil_erp,0)+ifnull(oil_kl,0)) oil_us_liter,");
+		sql.append("sum(ifnull(coil_erp,0)+ifnull(coil_kl,0)) coil_us_liter,");
+		sql.append("sum(ifnull(work_cost,0)) work_us_liter,sum(ifnull(engine_cost,0)) engine_us_liter,sum(engine_cost_kg)/1000 engine_cost_ton");
+		sql.append(" from t_car_consume s");
+		sql.append(" inner join t_car c on s.car_id=c.car_id");
+		sql.append(" inner join t_quota_rule r on c.quota_rule_id=r.record_id");
+		sql.append(" where DATE_FORMAT(s.rpt_date,'%Y') = ? ");
+		sql.append(" group by DATE_FORMAT(s.rpt_date,'%Y-%m')");
+		return dao.queryForListPojo(sql.toString(), CarConsumeMulRptVO.class,year);
 	}
 	
 	/**

src/main/java/com/hb/proj/model/CarConsumeMulRptVO.java

@@ -0,0 +1,203 @@
+package com.hb.proj.model;
+
+import com.hb.proj.car.service.CarRptUtils;
+
+/**
+ * 单车油耗实体（目前用于综合分析报表-万元占比报表计算）
+ * @author cwen
+ *
+ */
+public class CarConsumeMulRptVO {
+	
+	private String rptMonth;  //yyyy-MM
+
+	private Double  checkMile; //考核里程  km
+	
+	private Double  oilTravelMile; //汽油车 行驶里程  km
+	
+	private Double  coilTravelMile; //柴油车 行驶里程  km
+	
+	private Double oilUsLiter; //车辆汽油使用量 升
+	
+	private Double coilUsLiter; //车辆柴油使用量 升
+	
+	private Double workUsLiter; //作业使用量 升
+	
+	private Double engineUsLiter; //发电机使用量 升
+	
+	private Double costKg100km ; //百公里耗油=(汽油+柴油)/考核公里  车辆综合油耗
+	
+	private Double coilLiter100km ; //  柴油车行驶油耗  升/百公里
+
+	private Double coilLiterWellCount ; //  柴油车井次油耗   升/井次
+
+	private Double oilLiter100km ; //  汽油车行驶油耗  升/百公里
+
+	private Double oilLiterWellCount ; //  汽油车井次油耗   升/井次
+	
+	private Double engineLiterWellCount ; //  发电机井次油耗  升/井次
+	
+	private Double engineCostTon; // 发电机油耗  吨
+	
+	private Integer wellCount; //井次
+	
+	public void calculate(Integer wcount){
+		this.wellCount=wcount!=null?wcount:0;
+		
+		//柴油车行驶油耗=柴有使用量-发电机油耗-作业油耗
+		Double travelCoil=coilUsLiter;
+		travelCoil=CarRptUtils.reduceDouble(travelCoil, workUsLiter);
+		travelCoil=CarRptUtils.reduceDouble(travelCoil, engineUsLiter);
+		
+		coilTravelMile=coilTravelMile!=null?(coilTravelMile/100):0.0; //转换为百公里
+		oilTravelMile=oilTravelMile!=null?(oilTravelMile/100):0.0; //转换为百公里
+		
+		//柴油车行驶油耗(升/百公里)
+		this.coilLiter100km=divideDouble(travelCoil,coilTravelMile);
+		//柴油车井次油耗(升/井次)
+		this.coilLiterWellCount=divideDouble(coilUsLiter,wellCount+0.0);
+		//汽油车行驶油耗(升/百公里)
+		this.oilLiter100km=divideDouble(oilUsLiter,oilTravelMile);
+		//汽油车井次油耗(升/井次)
+		this.oilLiterWellCount=divideDouble(oilUsLiter,wellCount+0.0);
+		//发电机井次油耗
+		this.engineLiterWellCount=divideDouble(engineUsLiter,wellCount+0.0);
+	}
+	
+	private Double divideDouble(Double d1,Double d2){
+		if(d1==null||d2==null||d2.doubleValue()==0){
+			return null;
+		}
+		return d1.doubleValue()/d2.doubleValue();
+	}
+
+	public Double getCheckMile() {
+		return checkMile;
+	}
+
+	public void setCheckMile(Double checkMile) {
+		this.checkMile = checkMile;
+	}
+
+	public Double getOilTravelMile() {
+		return oilTravelMile;
+	}
+
+	public void setOilTravelMile(Double oilTravelMile) {
+		this.oilTravelMile = oilTravelMile;
+	}
+
+	public Double getCoilTravelMile() {
+		return coilTravelMile;
+	}
+
+	public void setCoilTravelMile(Double coilTravelMile) {
+		this.coilTravelMile = coilTravelMile;
+	}
+
+	public Double getOilUsLiter() {
+		return oilUsLiter;
+	}
+
+	public void setOilUsLiter(Double oilUsLiter) {
+		this.oilUsLiter = oilUsLiter;
+	}
+
+	public Double getCoilUsLiter() {
+		return coilUsLiter;
+	}
+
+	public void setCoilUsLiter(Double coilUsLiter) {
+		this.coilUsLiter = coilUsLiter;
+	}
+
+	public Double getWorkUsLiter() {
+		return workUsLiter;
+	}
+
+	public void setWorkUsLiter(Double workUsLiter) {
+		this.workUsLiter = workUsLiter;
+	}
+
+	public Double getEngineUsLiter() {
+		return engineUsLiter;
+	}
+
+	public void setEngineUsLiter(Double engineUsLiter) {
+		this.engineUsLiter = engineUsLiter;
+	}
+
+	public String getRptMonth() {
+		return rptMonth;
+	}
+
+	public void setRptMonth(String rptMonth) {
+		this.rptMonth = rptMonth;
+	}
+
+	public Double getCostKg100km() {
+		return costKg100km;
+	}
+
+	public void setCostKg100km(Double costKg100km) {
+		this.costKg100km = costKg100km;
+	}
+
+	public Double getCoilLiter100km() {
+		return coilLiter100km;
+	}
+
+	public void setCoilLiter100km(Double coilLiter100km) {
+		this.coilLiter100km = coilLiter100km;
+	}
+
+	public Double getCoilLiterWellCount() {
+		return coilLiterWellCount;
+	}
+
+	public void setCoilLiterWellCount(Double coilLiterWellCount) {
+		this.coilLiterWellCount = coilLiterWellCount;
+	}
+
+	public Double getOilLiter100km() {
+		return oilLiter100km;
+	}
+
+	public void setOilLiter100km(Double oilLiter100km) {
+		this.oilLiter100km = oilLiter100km;
+	}
+
+	public Double getOilLiterWellCount() {
+		return oilLiterWellCount;
+	}
+
+	public void setOilLiterWellCount(Double oilLiterWellCount) {
+		this.oilLiterWellCount = oilLiterWellCount;
+	}
+
+	public Double getEngineLiterWellCount() {
+		return engineLiterWellCount;
+	}
+
+	public void setEngineLiterWellCount(Double engineLiterWellCount) {
+		this.engineLiterWellCount = engineLiterWellCount;
+	}
+
+	public Double getEngineCostTon() {
+		return engineCostTon;
+	}
+
+	public void setEngineCostTon(Double engineCostTon) {
+		this.engineCostTon = engineCostTon;
+	}
+
+	public Integer getWellCount() {
+		return wellCount;
+	}
+
+	public void setWellCount(Integer wellCount) {
+		this.wellCount = wellCount;
+	}
+
+	
+}

src/main/java/com/hb/proj/model/EnergyWaterRatioCompareVO.java

@@ -16,6 +16,8 @@ public class EnergyWaterRatioCompareVO {
 	
 	private Workload workload;
 	
+	private CarConsumeMulRptVO carRptConsume;
+	
 	private Double oilTotal;  //汽油总量 吨
 	
 	private Double coilTotal;  //柴油总量 吨
@@ -36,13 +38,16 @@ public class EnergyWaterRatioCompareVO {
 	
 	private Double powerBuilderArea; // 千瓦时/平方米 建筑面积
 	
-	private Double oilCost100km ; //百公里耗油=(汽油+柴油)/考核公里
+	private Double oilCost100km ; //百公里耗油=(汽油+柴油)/考核公里  车辆综合油耗
+	
+	
 	
-	public EnergyWaterRatioCompareVO (ERP erpkl, Wpg  wpg, Workload workload,Double checkMile){
+	public EnergyWaterRatioCompareVO (ERP erpkl, Wpg  wpg, Workload workload,CarConsumeMulRptVO carConsume){
 		this.erpkl=erpkl;
 		this.wpg=wpg;
 		this.workload=workload;
-		this.checkMile=checkMile;
+		this.carRptConsume=carConsume;
+		this.checkMile=carConsume!=null&&carConsume.getCheckMile()!=null?carConsume.getCheckMile():0;
 		this.oilTotal=erpkl.getOilCount();  //借用字段存有erp+昆仑卡值
 		this.coilTotal=erpkl.getCoilCount();
 		
@@ -82,13 +87,15 @@ public class EnergyWaterRatioCompareVO {
 		}
 		//指标值计算
 		
+		Double wellCount=getDouble(this.workload.getWellCount());
+		
 		this.coalKgIndustryValue=this.workload!=null?divideDouble(this.coals,this.workload.getIndustryValue()):null;
 		this.coalKgAddedValue=this.workload!=null?divideDouble(this.coals,this.workload.getAddedValue()):null;
 		
 		if(this.getWpg()!=null&&this.getWpg().getWaterCount()!=null&&this.workload!=null){
 			this.waterIndustryValue=divideDouble(this.getWpg().getWaterCount(),this.workload.getIndustryValue());
 		}
-		this.coalKgWellCount=this.workload!=null?divideDouble(this.coals,getDouble(this.workload.getWellCount())):null;
+		this.coalKgWellCount=this.workload!=null?divideDouble(this.coals,wellCount):null;
 		if(this.getWpg()!=null&&this.getWpg().getPowerCount()!=null&&this.getWorkload()!=null){
 			this.powerBuilderArea=divideDouble(this.getWpg().getPowerCount(),this.getWorkload().getBuilderArea());
 		}
@@ -97,6 +104,9 @@ public class EnergyWaterRatioCompareVO {
 			this.oilCost100km=divideDouble(this.oilCoilTotal,this.checkMile);
 		}
 		
+		//2022.7.16 增加额外指标值： 柴油车行驶油耗(升/百公里)、柴油车井次油耗(升/井次)、汽油车行驶油耗(升/百公里)、汽油车井次油耗(升/井次)、发电机井次油耗(升/井次)
+		this.carRptConsume.calculate(this.workload.getWellCount());
+		
 	}
 	
 	private Double getDouble(Integer val){
@@ -222,18 +232,6 @@ public class EnergyWaterRatioCompareVO {
 	}
 
 
-	public Double getOilCost100km() {
-		return oilCost100km;
-	}
-
-
-	public void setOilCost100km(Double oilCost100km) {
-		this.oilCost100km = oilCost100km;
-	}
-
-
-	
-
 	public Double getCheckMile() {
 		return checkMile;
 	}
@@ -252,4 +250,27 @@ public class EnergyWaterRatioCompareVO {
 	public void setOilCoilTotal(Double oilCoilTotal) {
 		this.oilCoilTotal = oilCoilTotal;
 	}
+
+
+	
+
+
+	public CarConsumeMulRptVO getCarRptConsume() {
+		return carRptConsume;
+	}
+
+
+	public void setCarRptConsume(CarConsumeMulRptVO carRptConsume) {
+		this.carRptConsume = carRptConsume;
+	}
+
+
+	public Double getOilCost100km() {
+		return oilCost100km;
+	}
+
+
+	public void setOilCost100km(Double oilCost100km) {
+		this.oilCost100km = oilCost100km;
+	}
 }

src/main/java/com/hb/proj/model/EnergyWaterSumVO.java

@@ -25,6 +25,8 @@ public class EnergyWaterSumVO {
 	
 	private CarConsume  carConsume; //通过每个车辆统计的数据
 	
+	private CarConsumeMulRptVO  indConsume; //通过每个车辆统计的其它指标数(柴油车行驶油耗 （升/百公里） 等)
+	
 	private String rptMonth;
 	
     private Double oilCompared;  //汽油同比
@@ -51,6 +53,8 @@ public class EnergyWaterSumVO {
 	
 	private Double coals; //折算吨煤
 	
+	
+	
 	public EnergyWaterSumVO (ERP  erpKl,Wpg   wpg,Workload  workload,CarConsume carConsume){
 		this.erpKl=erpKl;
 		this.wpg=wpg;
@@ -359,6 +363,15 @@ public class EnergyWaterSumVO {
 		this.engineCostCompared = engineCostCompared;
 	}
 
+	public CarConsumeMulRptVO getIndConsume() {
+		return indConsume;
+	}
+
+	public void setIndConsume(CarConsumeMulRptVO indConsume) {
+		this.indConsume = indConsume;
+	}
+
+	
 	
 	
 }

src/main/java/com/hb/proj/model/EnergyWaterSumVOUtil.java

@@ -92,8 +92,37 @@ public class EnergyWaterSumVOUtil {
 		return wpgIdx;
 	}
 	
+	
+	
+	
+	/**
+	 * 综合分析报表中的用能用水分月统计  增加了新的统计内容2022.7.16,先调用build
+	 * {@link EnergyWaterSumVOUtil.build}
+	 * @param sumMap
+	 * @param consumes
+	 */
+	
+	public static void attachForMulRpt(Map<String, EnergyWaterSumVO> sumMap,List<CarConsumeMulRptVO> consumes){
+		if(consumes==null||consumes.size()==0){
+			return ;
+		}
+		String month=null;
+		EnergyWaterSumVO  tmpSum=null;
+		Workload wkload=null;
+		int wellCount=0;
+		for(CarConsumeMulRptVO consume : consumes){
+			month=consume.getRptMonth().substring(5,7);
+			tmpSum=sumMap.get(month);
+			wkload=tmpSum.getWorkload();
+			wellCount=wkload!=null&&wkload.getWellCount()!=null?wkload.getWellCount().intValue():0;
+			consume.calculate(wellCount);
+			
+			tmpSum.setIndConsume(consume);
+		}
+	}
+	
 	/**
-	 * 用能用水统计汇总(分月显示12个月)
+	 * 用能用水统计汇总(分月显示12个月)、综合分析报表中的用能用水分月统计
 	 * @param erps
 	 * @param kls
 	 * @param wpgs

src/main/webapp/page/rpt/js/multiRpt.js

@@ -44,7 +44,7 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 		 let month=$("#month").val();
 		 
 		 querySumCompare(year,month);
-		 queryRatioCompare(year,month);
+		 queryWYRatioCompare(year,month);
 		 loadCoalRatioRpt(year);
 		 loadCoalRatioChart(year);
 		 loadEnergyMthGroup(year);
@@ -67,7 +67,7 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 			 layer.close(loading);
 			 if(resp.success){
 				 layer.msg("操作成功！");
-				 queryRatioCompare();
+				 queryWYRatioCompare(submitData.year,submitData.month);
 			 }
 			 else{
 				 layer.msg(resp.exception);
@@ -91,7 +91,7 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	 }
 	 
 	 //占比同比报表
-	 function queryRatioCompare(yyyy,mm){
+	 function queryWYRatioCompare(yyyy,mm){
 		 page.ajax({
 			 url:"rpt/yearWYRatioCompare.do",
 			 dataType:"text",

src/main/webapp/page/rpt/multiRpt.html

@@ -78,7 +78,7 @@ body{
     </div>
     <div class="layui-col-md12">
         <div class="layui-card">
-			<div class="layui-card-body" style="height:430px;" id="ratioRpt">
+			<div class="layui-card-body" style="height:560px;" id="ratioRpt">
 			   
 			</div>
 		</div>
@@ -101,7 +101,7 @@ body{
     
      <div class="layui-col-md12">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupbox">
+			<div class="layui-card-body" style="height:520px;" id="energyMthGroupbox">
 			  
 			</div>
 		</div>

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

@@ -178,25 +178,25 @@
 <td><div class="rpt-table-cell rpttab-cell-8"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-9"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-10"></div></td>
-<td formula="sum(K1:K${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-11"></div></td>
-<td formula="sum(L1:L${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-12"></div></td>
-<td formula="sum(M1:M${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-13"></div></td>
-<td formula="sum(N1:N${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-14"></div></td>
-<td formula="sum(O1:O${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-15"></div></td>
-
-<td formula="sum(P1:P${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-16"></div></td>
-<td formula="sum(Q1:Q${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-17"></div></td>
-<td formula="sum(R1:R${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-18"></div></td>
-
-<td formula="sum(S1:S${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-19"></div></td>
-<td formula="sum(T1:T${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-20"></div></td>
-<td formula="sum(U1:U${datas?size+1})" decimal="2"><div class="rpt-table-cell rpttab-cell-21"></div></td>
-<td formula="sum(V1:V${datas?size+1})" decimal="2"><div class="rpt-table-cell rpttab-cell-22"></div></td>
-<td formula="sum(W1:W${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-23"></div></td>
-<td formula="sum(X1:X${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-24"></div></td>
-<td formula="sum(Y1:Y${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-25"></div></td>
-<td formula="sum(Z1:Z${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-26"></div></td>
-<td formula="sum(AA1:AA${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-27"></div></td>
+<td formula="sum(L1:L${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-11"></div></td>
+<td formula="sum(M1:M${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-12"></div></td>
+<td formula="sum(N1:N${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-13"></div></td>
+<td formula="sum(O1:O${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-14"></div></td>
+<td formula="sum(P1:P${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-15"></div></td>
+
+<td formula="sum(Q1:Q${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-16"></div></td>
+<td formula="sum(R1:R${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-17"></div></td>
+<td formula="sum(S1:S${datas?size})" decimal="1"><div class="rpt-table-cell rpttab-cell-18"></div></td>
+
+<td formula="sum(T1:T${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-19"></div></td>
+<td formula="sum(U1:U${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-20"></div></td>
+<td formula="sum(V1:V${datas?size+1})" decimal="2"><div class="rpt-table-cell rpttab-cell-21"></div></td>
+<td formula="sum(W1:W${datas?size+1})" decimal="2"><div class="rpt-table-cell rpttab-cell-22"></div></td>
+<td formula="sum(X1:X${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-23"></div></td>
+<td formula="sum(Y1:Y${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-24"></div></td>
+<td formula="sum(Z1:Z${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-25"></div></td>
+<td formula="sum(AA1:AA${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-26"></div></td>
+<td formula="sum(AB1:AB${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-27"></div></td>
 
 </tr>
 

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

@@ -16,7 +16,8 @@
 #energyMthGroupbox .rpttab-cell-10{width:100px;}
 #energyMthGroupbox .rpttab-cell-11{width:100px;}
 #energyMthGroupbox .rpttab-cell-12{width:100px;}
-
+#energyMthGroupbox .dbline-row .rpt-table-cell{height:40px;line-height:40px;}
+#energyMthGroupbox .dbline-row .dbline-head{line-height:20px;}
 </style>
 
 <div class="rpt-table-box">
@@ -87,6 +88,49 @@
 		</#list>
 		</tr>
 		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">柴油车行驶油耗<br>(升/百公里)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.coilLiter100km)!0;m3M3}</div></td>
+			</#list>
+		</tr>
+		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">柴油车井次油耗<br>(升/井次)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.coilLiterWellCount)!0;m3M3}</div></td>
+			</#list>
+		</tr>
+		
+		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">汽油车行驶油耗<br>(升/百公里)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.oilLiterWellCount)!0;m3M3}</div></td>
+			</#list>
+		</tr>
+		
+		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">汽油车井次油耗<br>(升/井次)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.oilLiterWellCount)!0;m3M3}</div></td>
+			</#list>
+		</tr>
+		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">发电机油耗<br>(吨)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.engineCostTon)!0;m3M3}</div></td>
+			</#list>
+		</tr>
+		
+		<tr class="dataRow dbline-row">
+			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">发电机井次油耗<br>(升/井次)</div></td>
+			<#list months as mth>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.engineLiterWellCount)!0;m3M3}</div></td>
+			</#list>
+		</tr>
 		
 		</table>
 	</div>

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

@@ -3,6 +3,7 @@
  <span class="mainHeader"></span>
 </div>
 <style>
+
 #ratioRpt .rpttab-cell-0{width:120px;}
 #ratioRpt .rpttab-cell-1{width:100px;}
 #ratioRpt .rpttab-cell-2{width:80px;}
@@ -13,8 +14,9 @@
 #ratioRpt .rpttab-cell-7{width:120px;}
 #ratioRpt .rpttab-cell-8{width:90px;}
 #ratioRpt .rpttab-cell-9{width:90px;}
-#ratioRpt .dblline-cell{height:56px;}
-
+#ratioRpt .dblline-cell{height:40px;}
+#ratioRpt .single-line .rpt-table-cell{height:40px;line-height:40px !important;}
+#ratioRpt .dbl-line .dblline-cell{height:40px;line-height:20px;}
 </style>
 <div class="rpt-table-box">
   <div class="rpt-table-header">
@@ -41,7 +43,7 @@
   </div>
   <div class="rpt-table-body rpt-table-main">
       <table cellpadding="0" cellspacing="0"  class="rpt-table" align="center" id="ratioCompareTab">  
-		<tr class="dataRow">
+		<tr class="dataRow dbl-line">
 		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">万元产值<br>综合能耗</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">千克标煤<br>/万元</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.coalKgIndustryValue)!0;m3M3}</div></td>
@@ -54,7 +56,7 @@
 		<td rowspan="3"><div class="rpt-table-cell rpttab-cell-9">生产经营</div></td>
 		</tr>
 		
-		<tr class="dataRow">
+		<tr class="dataRow dbl-line">
 		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">万元增加值<br>综合能耗</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">千克标煤<br>/万元</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.coalKgAddedValue)!0;m3M3}</div></td>
@@ -66,7 +68,7 @@
 		<td formula="(C2-D2)/D2*100" decimal="2"><div class="rpt-table-cell rpttab-cell-8"></div></td>
 		</tr>
 		
-		<tr class="dataRow">
+		<tr class="dataRow dbl-line">
 		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">万元产值<br>新鲜水单耗</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">立方米<br>/万元</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.waterIndustryValue)!0;m3M3}</div></td>
@@ -78,7 +80,7 @@
 		<td formula="(C3-D3)/D3*100" decimal="2"><div class="rpt-table-cell rpttab-cell-8"></div></td>
 		</tr>
 		
-		<tr class="dataRow">
+		<tr class="dataRow dbl-line">
 		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">测井生产<br>综合能耗</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">千克标煤<br>/井次</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.coalKgWellCount)!0;m3M3}</div></td>
@@ -91,7 +93,7 @@
 		<td><div class="rpt-table-cell rpttab-cell-9">测井</div></td>
 		</tr>
 		
-		<tr class="dataRow">
+		<tr class="dataRow dbl-line">
 		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">单位建筑面积<br>用电量</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">千瓦时<br>/平方米</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.powerBuilderArea)!0;m3M3}</div></td>
@@ -104,9 +106,9 @@
 		<td><div class="rpt-table-cell rpttab-cell-9">办公</div></td>
 		</tr>
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0 dblline-cell">综合百公里油耗</div></td>
-		<td><div class="rpt-table-cell rpttab-cell-1 dblline-cell">千克<br>/百公里</div></td>
+		<tr class="dataRow single-line">
+		<td><div class="rpt-table-cell rpttab-cell-0">车辆综合油耗</div></td>
+		<td><div class="rpt-table-cell rpttab-cell-1">千克/百公里</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.oilCost100km)!0;m3M3}</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.oilCost100km)!0;m3M3}</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.oilCoilTotal)!0;m2M2}</div></td>
@@ -114,7 +116,72 @@
 		<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.oilCoilTotal)!0;m2M2}</div></td>
 		<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.checkMile)!0;m2M2}</div></td>
 		<td formula="(C6-D6)/D6*100" decimal="2"><div class="rpt-table-cell rpttab-cell-8"></div></td>
-		<td><div class="rpt-table-cell rpttab-cell-9">车辆</div></td>
+		<td rowspan="6"><div class="rpt-table-cell rpttab-cell-9">车辆</div></td>
+		</tr>
+		
+		<tr class="dataRow single-line">
+			<td><div class="rpt-table-cell rpttab-cell-0">柴油车行驶油耗</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-1">升/百公里</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.carRptConsume.coilLiter100km)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.carRptConsume.coilLiter100km)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.carRptConsume.coilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-5">#{(ratio.carRptConsume.coilTravelMile)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.carRptConsume.coilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.carRptConsume.coilTravelMile)!0;m2M2}</div></td>
+			<td formula="(C7-D7)/D7*100" decimal="2"><div class="rpt-table-cell rpttab-cell-8"></div></td>
+			
+		</tr>
+		
+		<tr class="dataRow single-line">
+			<td><div class="rpt-table-cell rpttab-cell-0">柴油车井次油耗</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-1">升/井次</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.carRptConsume.coilLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.carRptConsume.coilLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.carRptConsume.coilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-5">#{(ratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.carRptConsume.coilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td formula="(C8-D8)/D8*100" decimal="2"><div class="rpt-table-cell rpttab-cell-8"></div></td>
+			
+		</tr>
+		
+		<tr class="dataRow single-line">
+			<td><div class="rpt-table-cell rpttab-cell-0">汽油车行驶油耗</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-1">升/百公里</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.carRptConsume.oilLiter100km)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.carRptConsume.oilLiter100km)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.carRptConsume.oilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-5">#{(ratio.carRptConsume.oilTravelMile)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.carRptConsume.oilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.carRptConsume.oilTravelMile)!0;m2M2}</div></td>
+			<td formula="(C9-D9)/D9*100"><div class="rpt-table-cell rpttab-cell-8"></div></td>
+			
+		</tr>
+		
+		<tr class="dataRow single-line">
+			<td><div class="rpt-table-cell rpttab-cell-0">汽油车井次油耗</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-1">升/井次</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.carRptConsume.oilLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.carRptConsume.oilLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.carRptConsume.oilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-5">#{(ratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.carRptConsume.oilUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td formula="(C10-D10)/D10*100"><div class="rpt-table-cell rpttab-cell-8"></div></td>
+			
+		</tr>
+		
+		<tr class="dataRow single-line">
+			<td><div class="rpt-table-cell rpttab-cell-0">发电机井次油耗</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-1">升/井次</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-2">#{(ratio.carRptConsume.engineLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-3">#{(preratio.carRptConsume.engineLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-4">#{(ratio.carRptConsume.engineUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-5">#{(ratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-6">#{(preratio.carRptConsume.engineUsLiter)!0;m2M2}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-7">#{(preratio.carRptConsume.wellCount)!0;m2M2}</div></td>
+			<td formula="(C11-D11)/D11*100"><div class="rpt-table-cell rpttab-cell-8"></div></td>
+			
 		</tr>
 		
 		</table>