1.统计日报添加烂班空驶公里，临加空驶中而外计算子任务中产生的空驶；2.电量平衡表手动添加时设置默认值防止添加空值数据导致报错。

娄高锋
1 parent 7b042a01
Showing 14 changed files with 196 additions and 38 deletions
src/main/java/com/bsth/controller/calc/CalcWaybillController.java
src/main/java/com/bsth/controller/oil/DlbController.java
src/main/java/com/bsth/entity/calc/CalcStatistics.java
src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/CulateMileageService.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/electricity/list/add.html
src/main/resources/static/pages/forms/calc/statisticsDaily.html
src/main/resources/static/pages/forms/mould/statisticsDaily_2.xls
src/main/resources/static/pages/forms/mould/statisticsDaily_4.xls
src/main/resources/static/pages/forms/statement/statisticsDaily.html
src/main/resources/static/pages/forms/statement/statisticsDailyCalc2.html
@@ -48,7 +48,7 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 		if(date.length() > 0){
 			try {
-
+				
 				if(key.length() == 0){
 					resMap = calcWaybillService.generateNew(date, line);
 					resMap.put("status_daily", calcWaybillService.calcDaily(date, line));
@@ -60,7 +60,7 @@ public class CalcWaybillController extends BaseController&lt;CalcWaybill, Integer&gt; 
 					resMap.put("status", calcWaybillService.calcDaily(date, line));
 				} else if("3".equals(key)){
 					resMap = generateLineMileage(map);
-				} else if("2".equals(key)){
+				} else if("4".equals(key)){
 					resMap = generateBusMileage(map);
 				}
@@ -160,12 +160,12 @@ public class DlbController extends BaseController&lt;Dlb, Integer&gt;{
 			m.put("nbbm", y.getNbbm());
 			m.put("jsy", y.getJsy());
 			m.put("name", y.getName());
-			m.put("cdl", y.getCdl()<=0?"0":y.getCdl());
-			m.put("czcd", y.getCzcd()<=0?"0":y.getCzcd()+"%");
-			m.put("jzcd", y.getJzcd()<=0?"0":y.getJzcd()+"%");
-			m.put("czlc", y.getCzlc()<=0?"0":y.getCzlc());
-			m.put("jzlc", y.getJzlc()<=0?"0":y.getJzlc());
-			m.put("hd", y.getHd()<=0?"0":y.getHd());
+			m.put("cdl", y.getCdl()==null||y.getCdl()<=0?"0":y.getCdl());
+			m.put("czcd", y.getCzcd()==null||y.getCzcd()<=0?"0":y.getCzcd()+"%");
+			m.put("jzcd", y.getJzcd()==null||y.getJzcd()<=0?"0":y.getJzcd()+"%");
+			m.put("czlc", y.getCzlc()==null||y.getCzlc()<=0?"0":y.getCzlc());
+			m.put("jzlc", y.getJzlc()==null||y.getJzlc()<=0?"0":y.getJzlc());
+			m.put("hd", y.getHd()==null||y.getHd()<=0?"0":y.getHd());
 			String shyy ="无";
 			if(y.getShyy()!=null){
 				shyy=y.getShyy();
@@ -37,6 +37,8 @@ public class CalcStatistics {
 	private Double sjkslc;
 	/* 少驶公里*/
 	private Double sslc;
+	/* 少驶空驶公里*/
+	private Double sskslc;
 	/* 少驶班次*/
 	private int ssbc;
 	/* 路阻公里*/
@@ -198,6 +200,12 @@ public class CalcStatistics {
 	public void setSslc(Double sslc) {
 		this.sslc = sslc;
 	}
+	public Double getSskslc() {
+		return sskslc;
+	}
+	public void setSskslc(Double sskslc) {
+		this.sskslc = sskslc;
+	}
 	public int getSsbc() {
 		return ssbc;
 	}
@@ -289,6 +289,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		return newMap;
 	}
+	//使用人车统计表生成统计日报
 	@Override
 	public List<Map<String, Object>> statisticsDailyTj(String gsdm,
 			String fgsdm, String line, String date, String date2,
@@ -651,18 +652,21 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        double ljgl= culateService.culateLjgl(lists);
 	        double sjyygl= culateService.culateSjgl(lists);
 	        double zyygl= Arith.add(sjyygl,ljgl);
-	
-	        double ljksgl= culateService.culateLjksgl(lists);
 	        double sjjccgl=culateService.culateJccgl(lists);
 	        double sjksgl=culateService.culateKsgl(lists);
 	        double zksgl=Arith.add(sjjccgl, sjksgl);
 	        s.setSjyylc(zyygl);
 	        s.setSjkslc(zksgl);
 	        s.setSjzlc(Arith.add(zyygl, zksgl));
-	        
-	        s.setLjkslc(ljksgl);
+	        s.setLjlc(ljgl);
+	
+	        double ljksgl= culateService.culateLjksgl(lists);
+	        double zrwJcc = culateService.culateZrwJccLc(lists, "all"); // 子任务进出场
+	        double zrwKfks = culateService.culateZrwKfks(lists); // 子任务空放空驶
+	        s.setLjkslc(Arith.add(Arith.add(ljksgl, zrwJcc), zrwKfks)); // 202508根据工单需求添加“临加空驶”中而外算上子任务进出场公里。
 	        s.setSslc(culateService.culateLbgl(list));
+	        s.setSskslc(culateService.culateLbksgl(list)); // 202508根据工单需求添加“少驶空驶公里”
 	        s.setSsbc(culateService.culateLbbc(list));
 	        //计划+临加-少驶=实驶
@@ -689,7 +693,6 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 	        double ssgl_cj=culateService.culateCJLC(list, "抽减");
 	        double ssgl_qt=culateService.culateCJLC(list, "其他");
 	        s.setQtlc(Arith.add(Arith.add(ssgl_pc, ssgl_by),Arith.add(ssgl_cj, ssgl_qt)));
-	        s.setLjlc(ljgl);
 	        s.setJhbcq(culateService.culateJhbc(list,""));
 	        s.setJhbcz(culateService.culateJhbc(list, "zgf"));
@@ -767,22 +770,26 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		}
 		Map<String, Boolean> lineMap=lineService.lineNature();
 		List<CalcStatistics> list = new ArrayList<CalcStatistics>();
-		if(nature.equals("0")){
-			list=listAll;
-		}else{
-			for (int i = 0; i < listAll.size(); i++) {
-				CalcStatistics c=listAll.get(i);
-				if(nature.equals("1")){
-					if(lineMap.get(c.getXl())){
-						list.add(c);
-					}
-				}else{
-					if(!lineMap.get(c.getXl())){
-						list.add(c);
-					}
+		
+		for (int i = 0; i < listAll.size(); i++) {
+			CalcStatistics c = listAll.get(i);
+			if(c.getGsdm() != null && c.getGsdm().trim().length() > 0
+					&& c.getGsdm().trim().contains("77")){ // 跳过浦交中临港的数据
+				continue;
+			}
+			if(nature.equals("0")){
+				list.add(c);
+			}else if(nature.equals("1")){
+				if(lineMap.get(c.getXl())){
+					list.add(c);
+				}
+			}else{
+				if(!lineMap.get(c.getXl())){
+					list.add(c);
 				}
 			}
 		}
+		
 		List<CalcStatistics> resList = new ArrayList<CalcStatistics>();
 		Map<String, List<CalcStatistics>> keyMap = new HashMap<String, List<CalcStatistics>>();
 		List<String> keyList = new ArrayList<String>();
@@ -842,6 +849,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 			m.put("sjgl", c.getSjyylc());
 			m.put("sjksgl", c.getSjkslc());
 			m.put("ssgl", c.getSslc());
+			m.put("ssksgl", c.getSskslc());
 			m.put("ssbc", c.getSsbc());
 			m.put("ssgl_lz", c.getLzlc());
 			m.put("ssgl_dm", c.getDmlc());
@@ -1299,6 +1307,7 @@ public class CalcWaybillServiceImpl extends BaseServiceImpl&lt;CalcWaybill, Integer
 		s.setSjyylc(Arith.add(s.getSjyylc()!=null?s.getSjyylc():0, s_.getSjyylc()));
 		s.setSjkslc(Arith.add(s.getSjkslc()!=null?s.getSjkslc():0, s_.getSjkslc()));
 		s.setSslc(Arith.add(s.getSslc()!=null?s.getSslc():0, s_.getSslc()));
+		s.setSskslc(Arith.add(s.getSskslc()!=null?s.getSskslc():0, s_.getSskslc()));
 		s.setSsbc(s.getSsbc() + s_.getSsbc());
 		s.setLzlc(Arith.add(s.getLzlc()!=null?s.getLzlc():0, s_.getLzlc()));
 		s.setDmlc(Arith.add(s.getDmlc()!=null?s.getDmlc():0, s_.getDmlc()));
@@ -949,6 +949,29 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 		// TODO Auto-generated method stub
 		Map<String, Object> map = new HashMap<>();
 		SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+		
+		if(t.getZlc() == null){
+			t.setZlc(0D);
+		}
+		if(t.getCzlc() == null){
+			t.setCzlc(0D);
+		}
+		if(t.getJzlc() == null){
+			t.setJzlc(0D);
+		}
+		if(t.getCzcd() == null){
+			t.setCzcd(100D);
+		}
+		if(t.getJzcd() == null){
+			t.setJzcd(100D);
+		}
+		if(t.getNs() == null){
+			t.setNs(0D);
+		}
+		if(t.getSh() == null){
+			t.setSh(0D);
+		}
+		
 		String rq=sdf.format(t.getRq());
 		String gsdm=t.getSsgsdm();
 		String fgsdm=t.getFgsdm();
@@ -2914,7 +2914,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("jcclc", jhjcclc);
             map.put("jhzlc", Arith.add(jhyygl, jhjcclc));
             double ljks=culateService.culateLjksgl(lists);
-            map.put("ljks", ljks);
+            double zrwJcc = culateService.culateZrwJccLc(lists, "all"); // 子任务进出场
+            double zrwKfks = culateService.culateZrwKfks(lists); // 子任务空放空驶
+            map.put("ljks", Arith.add(Arith.add(ljks, zrwJcc), zrwKfks)); // 202508根据工单需求添加“临加空驶”中而外算上子任务进出场公里。
             double ljgl = culateService.culateLjgl(lists);
             double sjyygl = culateService.culateSjgl(lists);
             double zyygl = Arith.add(sjyygl, ljgl);
@@ -2926,7 +2928,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("sjgl", zyygl);
             map.put("sjksgl", zksgl);
             double ssgl = culateService.culateLbgl(list);
+            double ssksgl = culateService.culateLbksgl(list);
             map.put("ssgl", ssgl);
+            map.put("ssksgl", ssksgl); // 202508根据工单需求添加“少驶空驶公里”
             //计划+临加-少驶=实驶
             double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
@@ -3220,6 +3224,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         List<ScheduleRealInfo> list=new ArrayList<ScheduleRealInfo>();
         for (int i = 0; i < listAll.size(); i++) {
 			ScheduleRealInfo s=listAll.get(i);
+			if(s.getGsName() != null && s.getGsName().trim().length() > 0
+					&& s.getGsName().trim().contains("临港")){ // 跳过浦交中临港的数据
+				continue;
+			}
 			if (nature.equals("0")) {
 				list.add(s);
 			}else if(nature.equals("1")){
@@ -3306,7 +3314,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double sjyygl = culateService.culateSjgl(list_s);
         double zyygl = Arith.add(sjyygl, ljgl);
         double ljks=culateService.culateLjksgl(list_s);
-        map.put("ljks", ljks);
+        double zrwJcc = culateService.culateZrwJccLc(list_s, "all"); // 子任务进出场
+        double zrwKfks = culateService.culateZrwKfks(list_s); // 子任务空放空驶
+        map.put("ljks", Arith.add(Arith.add(ljks, zrwJcc), zrwKfks)); // 202508根据工单需求添加“临加空驶”中而外算上子任务进出场公里。
         double sjjccgl = culateService.culateJccgl(list_s);
         double sjksgl = culateService.culateKsgl(list_s);
         double zksgl = Arith.add(sjjccgl, sjksgl);
@@ -3315,7 +3325,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("sjksgl", zksgl);
         double ssgl = culateService.culateLbgl(list);
+        double ssksgl = culateService.culateLbksgl(list);
         map.put("ssgl", ssgl);
+        map.put("ssksgl", ssksgl); // 202508根据工单需求添加“少驶空驶公里”
         //计划+临加-少驶=实驶
         double jl = Arith.sub(Arith.add(jhyygl, ljgl), ssgl);
         if (jl == zyygl) {
@@ -10,6 +10,7 @@ public interface CulateMileageService {
 	 List<Map<String,Object>> jobFwqk(List<ScheduleRealInfo> lists);
 	 double culateLbgl(List<ScheduleRealInfo> lists);
+	 double culateLbksgl(List<ScheduleRealInfo> lists);
 	 int culateLbbc(List<ScheduleRealInfo> lists);
 	 List<Map<String,Object>> jobLjqk(List<ScheduleRealInfo> lists);
@@ -57,9 +58,22 @@ public interface CulateMileageService {
 	 double culateSsMileXx(List<ScheduleRealInfo> lists,String item);//烂班少驶详细
+	 /**
+	  * 统计子任务进出场公里
+	  * @param lists 实际排班list
+	  * @param item  进出场原因（统计全部原因则赋值为“all”）
+	  * @return 统计值
+	  */
 	 double culateZrwJccLc(List<ScheduleRealInfo> lists,String item);//子任务进出场
-	 double culateKfksLc(List<ScheduleRealInfo> lists);
+	 /**
+	  * 统计子任务空放空驶公里
+	  * @param lists 实际排班list
+	  * @return 统计值
+	  */
+	public double culateZrwKfks(List<ScheduleRealInfo> lists);
+	 
+	double culateKfksLc(List<ScheduleRealInfo> lists);
 }
@@ -194,6 +194,44 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	}
 	@Override
+	public double culateLbksgl(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double zlblc = 0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo scheduleRealInfo=lists.get(i);
+			
+			Set<ChildTaskPlan> childTaskPlans = scheduleRealInfo.getcTasks();
+			if(childTaskPlans.isEmpty()){
+				if (isInOut(scheduleRealInfo)) {
+					if(scheduleRealInfo.isDestroy()){
+						zlblc=Arith.add(zlblc,scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
+					}else{
+						double jhlc=scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc();
+						double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
+						double cjlc=Arith.sub(jhlcOrig, jhlc);
+						if(cjlc>0){
+							zlblc=Arith.add(zlblc, cjlc);
+						}
+					}
+				}
+			}else{
+				Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+                while (it.hasNext()) {
+                    ChildTaskPlan childTaskPlan = it.next();
+                    if(childTaskPlan.getCcId()==null){
+	                    if(childTaskPlan.getMileageType().equals("empty")){
+		                    if (childTaskPlan.isDestroy()) {
+		    					zlblc=Arith.add(zlblc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+		                    } 
+	                    }
+                    }
+                }
+			}
+		}
+		return zlblc;
+	}
+
+	@Override
 	public int culateLbbc(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
 		int lbbc=0;
@@ -1267,6 +1305,12 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
         return sum;
 	}
+	/**
+	  * 统计子任务进出场公里
+	  * @param lists 实际排班list
+	  * @param item  进出场原因（统计全部原因则赋值为“all”）
+	  * @return 统计值
+	  */
 	@Override
 	public double culateZrwJccLc(List<ScheduleRealInfo> lists, String item) {
 		// TODO Auto-generated method stub
@@ -1292,7 +1336,9 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			                    if(childTaskPlan.getType2().equals("2")||childTaskPlan.getType2().equals("3")){
 				                    if (!childTaskPlan.isDestroy()) {
 				                    	String reason=childTaskPlan.getReason()==null?"":childTaskPlan.getReason();
-				                    	if(reason.equals(item)){
+				                    	if("all".equals(item)){
+				                    		zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+				                    	}else if(reason.equals(item)){
 					                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
 				                    	}
 				                    } 
@@ -1305,6 +1351,38 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 		}
 		return zrwjcclc;
 	}
+	
+	/**
+	  * 统计子任务空放空驶公里
+	  * @param lists 实际排班list
+	  * @return 统计值
+	  */
+	@Override
+	public double culateZrwKfks(List<ScheduleRealInfo> lists) {
+		// TODO Auto-generated method stub
+		double zrwjcclc=0.0;
+		for (int i = 0; i < lists.size(); i++) {
+			ScheduleRealInfo t=lists.get(i);
+			if(!t.isSflj()){
+				if(!isInOut(t)){
+					Set<ChildTaskPlan> childTaskPlans = t.getcTasks();
+					if(!childTaskPlans.isEmpty()){
+						Iterator<ChildTaskPlan> it = childTaskPlans.iterator();
+		                while (it.hasNext()) {
+		                    ChildTaskPlan childTaskPlan = it.next();
+	                    	if(childTaskPlan.getType2().equals("1") && childTaskPlan.getMileageType().equals("empty")
+	                    			&& !("临加".equals(childTaskPlan.getType1()))){
+			                    if (!childTaskPlan.isDestroy()) {
+			                    	zrwjcclc=Arith.add(zrwjcclc,childTaskPlan.getMileage()==null?0:childTaskPlan.getMileage());
+			                    }
+		                    }
+		                }
+					}
+				}
+			}
+		}
+		return zrwjcclc;
+	}
 	@Override
 	public double culateKfksLc(List<ScheduleRealInfo> lists) {
@@ -361,6 +361,14 @@
 					'jsy' : {
 						required : true,
 						maxlength: 20
+					},
+					'cdl' : {
+						required : true,
+						maxlength: 20
+					},
+					'hd' : {
+						required : true,
+						maxlength: 20
 					}
 				},
 				invalidHandler : function(event, validator) {         
@@ -311,7 +311,7 @@
 			 params['date2'] = date2;
 			 params['xlName'] = xlName;
 			 params['type'] = "export";
-			$get('/realSchedule/statisticsDailyTj',params,function(result){
+			$get('/calcWaybill/statisticsDailyTj',params,function(result){
 				window.open("/downloadFile/download?fileName=统计日报"+moment(date).format("YYYYMMDD"));
 			});
 		});
@@ -81,12 +81,12 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
+								<th colspan="46"><label id="tjrq"></label> 线路统计日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span >分公司</span></td>
 								<td rowspan="3"><span >路线名</span></td>
-								<td colspan="22">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
+								<td colspan="23">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
 								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
@@ -98,7 +98,7 @@
 								<td rowspan="2"><label>实际</label><label>总公里</label></td>
 								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
 								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
-								<td rowspan="2"><span>少驶公里</span></td>
+								<td colspan="2">少驶公里</td>
 								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="12">少驶原因（公里）</td>
 								<td colspan="2">临加公里</td>
@@ -112,6 +112,8 @@
 								<td rowspan="2">原因</td>
 							</tr>
 							<tr>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
 								<td><span>路阻</span></td>
 								<td><span>吊慢</span></td>
 								<td><span>故障</span></td>
@@ -425,6 +427,7 @@
 			<td>{{obj.sjgl}}</td>
 			<td>{{obj.sjksgl}}</td>
 			<td>{{obj.ssgl}}</td>
+			<td>{{obj.ssksgl}}</td>
 			<td>{{obj.ssbc}}</td>
 			<td>{{obj.ssgl_lz}}</td>
 			<td>{{obj.ssgl_dm}}</td>
@@ -464,7 +467,7 @@
 	{{/each}}
 	{{if list.length == 0}}
 		<tr>
-			<td colspan="45"><h6 class="muted">没有找到相关数据</h6></td>
+			<td colspan="46"><h6 class="muted">没有找到相关数据</h6></td>
 		</tr>
 	{{/if}}
 </script>
 \ No newline at end of file
@@ -86,7 +86,7 @@
 							<tr>
 								<td rowspan="3"><span >分公司</span></td>
 								<td rowspan="3"><span >路线名</span></td>
-								<td colspan="22">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
+								<td colspan="23">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
 								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
@@ -98,7 +98,7 @@
 								<td rowspan="2"><label>实际</label><label>总公里</label></td>
 								<td rowspan="2"><label>实际营</label><label>运公里</label></td>
 								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
-								<td rowspan="2"><span>少驶公里</span></td>
+								<td colspan="2">少驶公里</td>
 								<td rowspan="2"><span>少驶班次</span></td>
 								<td colspan="12">少驶原因（公里）</td>
 								<td colspan="2">临加公里</td>
@@ -109,9 +109,11 @@
 								<td colspan="3">调头班次</td>
 								<td colspan="3">发生次数</td>
 								<td rowspan="2">最大间隔时间（分）</td>
-								<td  rowspan="2">原因</td>
+								<td rowspan="2">原因</td>
 							</tr>
 							<tr>
+								<td><span>营运</span></td>
+								<td><span>空驶</span></td>
 								<td><span>路阻</span></td>
 								<td><span>吊慢</span></td>
 								<td><span>故障</span></td>
@@ -405,6 +407,7 @@
 			<td>{{obj.sjyylc}}</td>
 			<td>{{obj.sjkslc}}</td>
 			<td>{{obj.sslc}}</td>
+			<td>{{obj.sskslc}}</td>
 			<td>{{obj.ssbc}}</td>
 			<td>{{obj.lzlc}}</td>
 			<td>{{obj.dmlc}}</td>