单车油耗统计（项目部、安全科）调整、增加显示列

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

@@ -28,6 +28,7 @@ import com.hb.proj.model.ERP;
 import com.hb.proj.model.OtherConsume;
 import com.hb.proj.utils.JsonOutUtils;
 import com.hb.proj.utils.MySessionUser;
+import com.hb.proj.utils.RptMonthUtil;
 import com.hb.proj.utils.RptOuter;
 import com.hb.xframework.util.DateUtil;
 import com.hb.xframework.util.SessionThreadLocal;
@@ -124,8 +125,10 @@ public class CarRptController {
 		//安全科用，采用新逻辑计算实际单耗：上报加油量+上期余油-本期余油
 		if(mgrRpt){
 			Set<String>  carIds=new HashSet<String>(carConsumes.size());
-			for(CarConsume car : carConsumes){
+			String crtMonth=DateUtil.format(new Date(), "yyyy-MM-dd");
+			for(CarConsumeRptVO car : carConsumes){
 				carIds.add(car.getCarId());
+				car.setRealAge(RptMonthUtil.getWorkAge(DateUtil.format(car.getWorkStart(),"yyyy-MM"),crtMonth));
 			}
 			
 			Map<String,Map<String,Object>> volMapping=monitorService.loadCarMonitorRpt(carIds,startMonth, endMonth); 

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

@@ -68,7 +68,7 @@ public class CarOilMonitorService {
 	public PageModel<Map<String,Object>>  queryOilCollect(String mountId,Date startDate,Date endDate,int pageNo,int pageSize){
 		StringBuilder sql=new StringBuilder(100);
 		sql.append("select t.* from t_oil_history_2 t");
-		sql.append(" where mount_id=? and data_time between ? and ?");
+		sql.append(" where (noise_if is null or noise_if<>1)  and  mount_id=? and data_time between ? and ?");
 		sql.append(" order by data_time desc");
 		return dao.queryForPagedListMap(sql.toString(),pageNo, pageSize,mountId,startDate,endDate);
 	}
@@ -83,7 +83,7 @@ public class CarOilMonitorService {
 	public List<Map<String,Object>> queryOilCollectForCurve(String mountId,Date startDate,Date endDate){
 		StringBuilder sql=new StringBuilder(100);
 		sql.append("select t.*,oil_volume data from t_oil_history_2 t");
-		sql.append(" where mount_id=? and data_time between ? and ? and oil_volume is not null and oil_volume>0");
+		sql.append(" where (noise_if is null or noise_if<>1)  and mount_id=? and data_time between ? and ? and oil_volume is not null and oil_volume>0");
 		sql.append(" order by data_time asc");
 		return dao.queryForListMap(sql.toString(),mountId,startDate,endDate);
 	}

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

@@ -37,7 +37,8 @@ public class CarRptService {
 	public List<CarConsumeRptVO>  loadCarConsumeDtl(String startMonth,String endMonth,String orgAssistCode,String deviceKey,String sortField,String sortType){
 		List<Object> params=new ArrayList<Object>();
 		StringBuilder sql=new StringBuilder();
-		sql.append("select c.car_num,c.device_name,c.device_model,c.work_start,c.oil_type,cg.org_name,oil.* ");
+		sql.append("select c.car_num,c.work_start,cg.org_name,oil.*, ");
+		sql.append(" r.oil_type,r.device_name,r.device_model");
 		sql.append(" from t_car c ");
 		
 		sql.append(" inner join (  ");
@@ -60,6 +61,8 @@ public class CarRptService {
 		
 		sql.append(" left join t_org  cg on c.belong_org=cg.org_id");
 		
+		sql.append(" left join t_quota_rule r on c.quota_rule_id=r.record_id");
+		
 		sql.append(" where 1=1 ");
 		
 		params.add(startMonth);
@@ -69,14 +72,14 @@ public class CarRptService {
 		if(StringUtils.isNotEmpty(deviceKey)){
 			String[] dns=deviceKey.split("[,，;；\\-~\\|\\s]+");
 			if(dns.length>1){ //两个参数
-				sql.append(" and ((device_name like ?  and device_model like ?) or (device_name like ?  and device_model like ?))");
+				sql.append(" and ((r.device_name like ?  and r.device_model like ?) or (r.device_name like ?  and r.device_model like ?))");
 				params.add("%"+dns[0]+"%");
 				params.add("%"+dns[1]+"%");
 				params.add("%"+dns[1]+"%");
 				params.add("%"+dns[0]+"%");
 			}
 			else{
-				sql.append(" and (device_name like ? or device_model like ?)");
+				sql.append(" and (r.device_name like ? or r.device_model like ?)");
 				params.add("%"+dns[0]+"%");
 				params.add("%"+dns[0]+"%");
 			}

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

@@ -1,5 +1,7 @@
 package com.hb.proj.model;
 
+import java.util.Date;
+
 public class CarConsumeRptVO extends CarConsume {
 
 	
@@ -15,6 +17,8 @@ public class CarConsumeRptVO extends CarConsume {
 	
 	private String orgName;   //当前所属部门
 	
+	private Date workStart;  //投产日期
+	
 
 	public void init(Double startVol,Double endVol){ //diffVolume=月初余油-月终余油 
 		if("汽油".equals(this.getOilType())){
@@ -108,4 +112,12 @@ public class CarConsumeRptVO extends CarConsume {
 	public void setOrgName(String orgName) {
 		this.orgName = orgName;
 	}
+
+	public Date getWorkStart() {
+		return workStart;
+	}
+
+	public void setWorkStart(Date workStart) {
+		this.workStart = workStart;
+	}
 }

src/main/webapp/page/car/carUpdate.html

@@ -36,7 +36,7 @@
 		  <div class="layui-form-item layui-col-sm10">
 		    <label class="layui-form-label">车牌号</label>
 		    <div class="layui-input-block">
-		      <input type="text" name="carNum" placeholder="请输入车牌号" autocomplete="off" class="layui-input" lay-verify="regMatch" verify-reg="^辽[A-Z0-9]+$" error="车牌号格式【辽xxxxx】且不能含空格">
+		      <input type="text" name="carNum" placeholder="请输入车牌号" autocomplete="off" class="layui-input" lay-verify="regMatch" verify-reg="^\S+[A-Z0-9]+$" error="车牌号格式【xxxxxx】且不能含空格">
 		      <input type="hidden" name="carId" id="carId">
 		    </div>
 		  </div>

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

@@ -36,7 +36,7 @@
 
 <tr>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-0">序号</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">累计</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">时间</div></td>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-2">设备名称</div></td>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-3">规格型号</div></td>
 <td colspan="2"><div class="rpt-table-cell">设备编号</div></td>
@@ -161,7 +161,7 @@
         <table cellpadding="0" cellspacing="0" class="rpt-table" align="center">
 			<tr>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-0">序号</div></td>
-			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">累计</div></td>
+			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">时间</div></td>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-2">设备名称</div></td>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-3">规格型号</div></td>
 			<td colspan="2"><div class="rpt-table-cell">设备编号</div></td>

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

@@ -10,30 +10,33 @@
 .rpttab-cell-4{width:330px;}
 .rpttab-cell-5{width:80px;}
 .rpttab-cell-6{width:100px;}
-.rpttab-cell-7{width:90px;}
+
+.rpttab-cell-7{width:60px;}
+
 .rpttab-cell-8{width:90px;}
-.rpttab-cell-9{width:260px;}
-.rpttab-cell-10{width:90px;}
+.rpttab-cell-9{width:90px;}
+.rpttab-cell-10{width:260px;}
 .rpttab-cell-11{width:90px;}
-.rpttab-cell-12{width:60px;}
+.rpttab-cell-12{width:90px;}
 .rpttab-cell-13{width:60px;}
-.rpttab-cell-14{width:85px;}
+.rpttab-cell-14{width:60px;}
+.rpttab-cell-15{width:85px;}
 
-.rpttab-cell-15{width:60px;}
 .rpttab-cell-16{width:60px;}
-.rpttab-cell-17{width:85px;}
+.rpttab-cell-17{width:60px;}
+.rpttab-cell-18{width:85px;}
 
-.rpttab-cell-18{width:70px;}
 .rpttab-cell-19{width:70px;}
 .rpttab-cell-20{width:70px;}
-
 .rpttab-cell-21{width:70px;}
+
 .rpttab-cell-22{width:70px;}
 .rpttab-cell-23{width:70px;}
-.rpttab-cell-24{width:85px;}
+.rpttab-cell-24{width:70px;}
 .rpttab-cell-25{width:85px;}
 .rpttab-cell-26{width:85px;}
-.rpttab-cell-27{width:70px;}
+.rpttab-cell-27{width:85px;}
+.rpttab-cell-28{width:70px;}
 </style>
 <div class="rpt-table-box">
   <div class="rpt-table-header">
@@ -41,41 +44,43 @@
 
 <tr>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-0">序号</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">累计</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">时间</div></td>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-2">项目部</div></td>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-3">设备名称</div></td>
 <td rowspan="2"><div class="rpt-table-cell rpttab-cell-4">规格型号</div></td>
 <td colspan="2"><div class="rpt-table-cell">设备编号</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-7 line-half">定额单耗<br>(L/100km)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-8 line-half">实际单耗<br>(L/100km)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-9 line-half">作业区域</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-10 line-half">考核里程<br>(km)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-11 line-half">行驶里程<br>(km)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-12 line-half">作业小时<br>(h)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-13 line-half">野外小时<br>(h)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-14 line-half">发电机<br>工作小时(h)</div></td>
-
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-15 line-half">作业耗油<br>(L)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-16 line-half">野外耗油<br>(L)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-17 line-half">发电机耗油<br>(L)</div></td>
+
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-7 line-half">年限<br>(年)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-8 line-half">定额单耗<br>(L/100km)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-9 line-half">实际单耗<br>(L/100km)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-10 line-half">作业区域</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-11 line-half">考核里程<br>(km)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-12 line-half">行驶里程<br>(km)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-13 line-half">作业小时<br>(h)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-14 line-half">野外小时<br>(h)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-15 line-half">发电机<br>工作小时(h)</div></td>
+
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-16 line-half">作业耗油<br>(L)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-17 line-half">野外耗油<br>(L)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-18 line-half">发电机耗油<br>(L)</div></td>
 
 <td colspan="2"><div class="rpt-table-cell">定额量(kg)</div></td>
 <td colspan="2"><div class="rpt-table-cell">加油量(kg)</div></td>
 <td colspan="2"><div class="rpt-table-cell">节超量(kg)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-24 line-half">上期余油量(L)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-25 line-half">本期余油量(L)</div></td>
-<td rowspan="2"><div class="rpt-table-cell rpttab-cell-26 line-half">实际加油量(L)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-25 line-half">上期余油量(L)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-26 line-half">本期余油量(L)</div></td>
+<td rowspan="2"><div class="rpt-table-cell rpttab-cell-27 line-half">实际加油量(L)</div></td>
 <td rowspan="2" patch><div class="rpt-table-cell rpt-patch-cell"></div></td>
 </tr>
 <tr>
 <td><div class="rpt-table-cell rpttab-cell-5">自编号</div></td>
 <td><div class="rpt-table-cell rpttab-cell-6">牌照号</div></td>
-<td><div class="rpt-table-cell rpttab-cell-18">汽油</div></td>
-<td><div class="rpt-table-cell rpttab-cell-19">柴油</div></td>
-<td><div class="rpt-table-cell rpttab-cell-20">汽油</div></td>
-<td><div class="rpt-table-cell rpttab-cell-21">柴油</div></td>
-<td><div class="rpt-table-cell rpttab-cell-22">汽油</div></td>
-<td><div class="rpt-table-cell rpttab-cell-23">柴油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-19">汽油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-20">柴油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-21">汽油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-22">柴油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-23">汽油</div></td>
+<td><div class="rpt-table-cell rpttab-cell-24">柴油</div></td>
 
 </tr>
 </table>
@@ -92,35 +97,36 @@
 <td><div class="rpt-table-cell rpttab-cell-4">${item.deviceModel!""}</div></td>
 <td><div class="rpt-table-cell rpttab-cell-5">${item.customNum!""}</div></td>
 <td><div class="rpt-table-cell rpttab-cell-6">${item.carNum}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-7">${item.unionQuotaPer100km!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-8">#{(item.travelPer100km)!0;m2M2}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-9">${item.workArea!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-10">${item.checkMile!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-11">${item.travelMile!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-12">${item.workHour!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-13">${item.outHour!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-14">${item.engineWorkHour!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-7">${item.realAge!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-8">${item.unionQuotaPer100km!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-9">#{(item.travelPer100km)!0;m2M2}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-10">${item.workArea!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-11">${item.checkMile!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-12">${item.travelMile!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-13">${item.workHour!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-14">${item.outHour!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-15">${item.engineWorkHour!""}</div></td>
 
-<td><div class="rpt-table-cell rpttab-cell-15">${item.workCost!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-16">${item.outCost!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-17">${item.engineCost!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-16">${item.workCost!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-17">${item.outCost!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-18">${item.engineCost!""}</div></td>
 
 
-<td><div class="rpt-table-cell rpttab-cell-18">${item.oilTotalQuota!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-19">${item.coilTotalQuota!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-19">${item.oilTotalQuota!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-20">${item.coilTotalQuota!""}</div></td>
 
 
-<td><div class="rpt-table-cell rpttab-cell-20">${item.oilRealCost!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-21">${item.coilRealCost!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-21">${item.oilRealCost!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-22">${item.coilRealCost!""}</div></td>
 
-<td><div class="rpt-table-cell rpttab-cell-22">${item.oilTotalQuota-item.oilRealCost}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-23">${item.coilTotalQuota-item.coilRealCost}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-23">${item.oilTotalQuota-item.oilRealCost}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-24">${item.coilTotalQuota-item.coilRealCost}</div></td>
 
 
-<td><div class="rpt-table-cell rpttab-cell-24">#{(item.startVolume)!0;m3M3}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-25">#{(item.endVolume)!0;m3M3}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-25">#{(item.startVolume)!0;m3M3}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-26">#{(item.endVolume)!0;m3M3}</div></td>
 
-<td><div class="rpt-table-cell rpttab-cell-26">#{(item.realCostMeter)!0;m3M3}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-27">#{(item.realCostMeter)!0;m3M3}</div></td>
 
 </tr>
 </#list>
@@ -142,20 +148,21 @@
 <td><div class="rpt-table-cell rpttab-cell-12"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-13"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-14"></div></td>
-
 <td><div class="rpt-table-cell rpttab-cell-15"></div></td>
+
 <td><div class="rpt-table-cell rpttab-cell-16"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-17"></div></td>
-
 <td><div class="rpt-table-cell rpttab-cell-18"></div></td>
+
 <td><div class="rpt-table-cell rpttab-cell-19"></div></td>
-<td><div class="rpt-table-cell rpttab-cell-20">${(otherConsume.oilCountKg)!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-21">${(otherConsume.coilCountKg)!""}</div></td>
-<td><div class="rpt-table-cell rpttab-cell-22"></div></td>
+<td><div class="rpt-table-cell rpttab-cell-20"></div></td>
+<td><div class="rpt-table-cell rpttab-cell-21">${(otherConsume.oilCountKg)!""}</div></td>
+<td><div class="rpt-table-cell rpttab-cell-22">${(otherConsume.coilCountKg)!""}</div></td>
 <td><div class="rpt-table-cell rpttab-cell-23"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-24"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-25"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-26"></div></td>
+<td><div class="rpt-table-cell rpttab-cell-27"></div></td>
 
 </tr>
 
@@ -170,25 +177,26 @@
 <td><div class="rpt-table-cell rpttab-cell-7"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-8"></div></td>
 <td><div class="rpt-table-cell rpttab-cell-9"></div></td>
-<td formula="sum(K1:K${datas?size})" decimal="2"><div class="rpt-table-cell rpttab-cell-10"></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="1"><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="2"><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+1})" 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})" 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><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>
 
 </tr>
 
@@ -202,7 +210,7 @@
         <table cellpadding="0" cellspacing="0" class="rpt-table" align="center">
 			<tr>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-0">序号</div></td>
-			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">累计</div></td>
+			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-1">时间</div></td>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-2">项目部</div></td>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-3">设备名称</div></td>
 			<td rowspan="2"><div class="rpt-table-cell rpttab-cell-4">规格型号</div></td>