闵行调度报表，烂班类型修改。

娄高锋
1 parent 5270a177
Showing 8 changed files with 79 additions and 93 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/static/pages/forms/mh_sj/scheduleDaily/scheduleDaily_mh.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/scheduleDailyQp.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
@@ -2123,7 +2123,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
 						lzbc++;
 //						lzlc = lzlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("借调") != -1){
 						dmbc++;
 //						dmlc = dmlc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
@@ -2132,25 +2132,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
 						jfbc++;
 //						jflc = jflc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("事故") != -1){
 						zsbc++;
 //						zslc = zslc.add(lc);
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
 						qrbc++;
 //						qrlc = qrlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("验车") != -1){
 						qcbc++;
 //						qclc = qclc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("保养") != -1){
 						kxbc++;
 //						kxlc = kxlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("天气") != -1){
 						qhbc++;
 //						qhlc = qhlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("支援") != -1){
 						wybc++;
 //						wylc = wylc.add(lc);
-					} else {
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("其他") != -1){
 						qtbc++;
 //						qtlc = qtlc.add(lc);
 					}
@@ -2171,19 +2171,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList));
 			lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));
-			dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));
+			dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "借调"));
 			gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));
 			jflc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "纠纷"));
-			zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "肇事"));
+			zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "事故"));
 			qrlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺人"));
-			qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺车"));
-			kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "客稀"));
-			qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));
-			wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));
-			qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(
-					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(
-					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(
-					new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他")));
+			qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "验车"));
+			kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"));
+			qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "天气"));
+			wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "支援"));
+			qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他"));
 			boolean flag = true;
 			if(jhlc.doubleValue() == 0d){
@@ -2618,20 +2618,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double lbgl = culateService.culateLbgl(list_s);
         map.put("ssgl", lbgl);
         map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
+        map.put("ssgl_dm", culateService.culateCJLC(list_s, "借调"));
         map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
         map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
+        map.put("ssgl_zs", culateService.culateCJLC(list_s, "事故"));
         map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
-        double ssgl_pc = culateService.culateCJLC(list_s, "配车");
-        double ssgl_by = culateService.culateCJLC(list_s, "保养");
-        double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
-        double ssgl_qt = culateService.culateCJLC(list_s, "其他");
-        map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
+        map.put("ssgl_qc", culateService.culateCJLC(list_s, "验车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list_s, "保养"));
+        map.put("ssgl_qh", culateService.culateCJLC(list_s, "天气"));
+        map.put("ssgl_yw", culateService.culateCJLC(list_s, "支援"));
+        map.put("ssgl_other", culateService.culateCJLC(list_s, "其他"));
         map.put("ssbc", culateService.culateLbbc(list_s));
         double ljgl = culateService.culateLjgl(lists);
         map.put("ljgl", ljgl);
@@ -2715,20 +2711,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         double lbgl = culateService.culateLbgl(list_s);
         map.put("ssgl", lbgl);
         map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
+        map.put("ssgl_dm", culateService.culateCJLC(list_s, "借调"));
         map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
         map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
+        map.put("ssgl_zs", culateService.culateCJLC(list_s, "事故"));
         map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
-        double ssgl_pc = culateService.culateCJLC(list_s, "配车");
-        double ssgl_by = culateService.culateCJLC(list_s, "保养");
-        double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
-        double ssgl_qt = culateService.culateCJLC(list_s, "其他");
-        map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
+        map.put("ssgl_qc", culateService.culateCJLC(list_s, "验车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list_s, "保养"));
+        map.put("ssgl_qh", culateService.culateCJLC(list_s, "天气"));
+        map.put("ssgl_yw", culateService.culateCJLC(list_s, "支援"));
+        map.put("ssgl_other", culateService.culateCJLC(list_s, "其他"));
         map.put("ssbc", culateService.culateLbbc(list_s));
         double ljgl = culateService.culateLjgl(lists);
         map.put("ljgl", ljgl);
@@ -2953,20 +2945,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("zt", 1);
         }
         map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
-        map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
+        map.put("ssgl_dm", culateService.culateCJLC(list, "借调"));
         map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
         map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
-        map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
+        map.put("ssgl_zs", culateService.culateCJLC(list, "事故"));
         map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
-        map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
-        map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
-        map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
-        map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
-        double ssgl_pc = culateService.culateCJLC(list, "配车");
-        double ssgl_by = culateService.culateCJLC(list, "保养");
-        double ssgl_cj = culateService.culateCJLC(list, "抽减");
-        double ssgl_qt = culateService.culateCJLC(list, "其他");
-        map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
+        map.put("ssgl_qc", culateService.culateCJLC(list, "验车"));
+        map.put("ssgl_kx", culateService.culateCJLC(list, "保养"));
+        map.put("ssgl_qh", culateService.culateCJLC(list, "天气"));
+        map.put("ssgl_yw", culateService.culateCJLC(list, "支援"));
+        map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
         map.put("ssbc", culateService.culateLbbc(list));
         map.put("ljgl", ljgl);
@@ -31,7 +31,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 	@Override
 	public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
 		// TODO Auto-generated method stub
-		String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
+//		String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
+		String[] lblxs = {"路阻","借调","故障","纠纷","事故","缺人","验车","保养","天气","支援","其他"};
 		List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
 		for (int i = 0; i < lists.size(); i++) {
 			ScheduleRealInfo scheduleRealInfo = lists.get(i);
@@ -95,16 +95,16 @@ word-wrap: break-word;
 								<td colspan="5" 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>
+								<td><span>路阻</span></td>
+								<td><span>借调</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>事故</span></td>
 								<td><span>缺人</span></td>
-								<td><span>缺车</span></td>
-								<td><span >客稀</span></td>
-								<td><span>气候</span></td>
-								<td><span>援外</span></td>
+								<td><span>验车</span></td>
+								<td><span>保养</span></td>
+								<td><span>天气</span></td>
+								<td><span>支援</span></td>
 								<td><span>其他</span></td>
 								<td><span ><c>全日</c></span></td>
 								<td><span >早高峰</span></td>
@@ -33,15 +33,15 @@
 						<span class="item-label" style="width: 80px;">烂班原因: </span>
 						<input class="form-control" type="checkbox" id="totalLb" style="width: 20px;" checked="true"/>全选 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="0" checked="true"/>路阻 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="1" checked="true"/>吊慢 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="1" checked="true"/>借调 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="2" checked="true"/>故障 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="3" checked="true"/>纠纷 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="4" checked="true"/>肇事 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="4" checked="true"/>事故 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="5" checked="true"/>缺人 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="6" checked="true"/>缺车 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候 
-						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="6" checked="true"/>验车 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>保养 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>天气 
+						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>支援 
 						<input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他 
 					</div>
 					<div style="margin-top: 5px"></div>
@@ -538,15 +538,15 @@
 	<tr>
 		<th class="hidden"></th>
 		{{if reason[0].checked == true}}<th colspan="3">路阻</th>{{/if}}
-		{{if reason[1].checked == true}}<th colspan="3">吊慢</th>{{/if}}
+		{{if reason[1].checked == true}}<th colspan="3">借调</th>{{/if}}
 		{{if reason[2].checked == true}}<th colspan="3">故障</th>{{/if}}
 		{{if reason[3].checked == true}}<th colspan="3">纠纷</th>{{/if}}
-		{{if reason[4].checked == true}}<th colspan="3">肇事</th>{{/if}}
+		{{if reason[4].checked == true}}<th colspan="3">事故</th>{{/if}}
 		{{if reason[5].checked == true}}<th colspan="3">缺人</th>{{/if}}
-		{{if reason[6].checked == true}}<th colspan="3">缺车</th>{{/if}}
-		{{if reason[7].checked == true}}<th colspan="3">客稀</th>{{/if}}
-		{{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
-		{{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
+		{{if reason[6].checked == true}}<th colspan="3">验车</th>{{/if}}
+		{{if reason[7].checked == true}}<th colspan="3">保养</th>{{/if}}
+		{{if reason[8].checked == true}}<th colspan="3">天气</th>{{/if}}
+		{{if reason[9].checked == true}}<th colspan="3">支援</th>{{/if}}
 		{{if reason[10].checked == true}}<th colspan="3">其他</th>{{/if}}
 	</tr>
 	<tr>
@@ -92,15 +92,15 @@
 							</tr>
 							<tr>
 								<td><span>路阻</span></td>
-								<td><span>吊慢</span></td>
+								<td><span>借调</span></td>
 								<td><span>故障</span></td>
 								<td><span>纠纷</span></td>
-								<td><span>肇事</span></td>
+								<td><span>事故</span></td>
 								<td><span>缺人</span></td>
-								<td><span>缺车</span></td>
-								<td><span>客稀</span></td>
-								<td><span>气候</span></td>
-								<td><span>援外</span></td>
+								<td><span>验车</span></td>
+								<td><span>保养</span></td>
+								<td><span>天气</span></td>
+								<td><span>支援</span></td>
 								<td><span>其他</span></td>
 								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
@@ -74,15 +74,15 @@
 							</tr>
 							<tr>
 								<td>路阻</td>
-								<td>吊慢</td>
+								<td>借调</td>
 								<td>故障</td>
 								<td>纠纷</td>
-								<td>肇事</td>
+								<td>事故</td>
 								<td>缺人</td>
-								<td>缺车</td>
-								<td>客稀</td>
-								<td>气候</td>
-								<td>援外</td>
+								<td>验车</td>
+								<td>保养</td>
+								<td>天气</td>
+								<td>支援</td>
 								<td>其他</td>
 								<td><c>全日</c></td>
 								<td>早高峰</td>
@@ -111,16 +111,16 @@
 								<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>
+								<td><span>路阻</span></td>
+								<td><span>借调</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>事故</span></td>
 								<td><span>缺人</span></td>
-								<td><span>缺车</span></td>
-								<td><span >客稀</span></td>
-								<td><span>气候</span></td>
-								<td><span>援外</span></td>
+								<td><span>验车</span></td>
+								<td><span>保养</span></td>
+								<td><span>天气</span></td>
+								<td><span>支援</span></td>
 								<td><span>其他</span></td>
 								<td><span>营运</span></td>
 								<td><span>空驶</span></td>