1.路单的烂班班次、临加班次过滤空驶班次类型

2.调度日报里面的少驶原因（公里）加入抽减类型

1.路单的烂班班次、临加班次过滤空驶班次类型
2.调度日报里面的少驶原因（公里）加入抽减类型
ljq
1 parent ee5b1569
Showing 8 changed files with 20 additions and 15 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
src/main/resources/static/pages/forms/mould/scheduleDaily_df.xls
src/main/resources/static/pages/forms/mould/scheduleDaily_m.xls
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/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
@@ -2233,14 +2233,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("jhbc", culateService.culateJhbc(list, ""));//计划班次
         map.put("jhlc", Arith.add(culateService.culateJhgl(list),
                 culateService.culateJhJccgl(list))); //计划总里程
-        map.put("cjbc", culateService.culateLbbc_yy_ks(list));//烂班班次
+        map.put("cjbc", culateService.culateLbbc(list));//烂班班次
         map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
         Map<String,Double> remmap = culateService.culateLbgl_yy_ks(list);
         map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
         map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
-        map.put("ljbc", culateService.culateLjbc_yy_ks(lists, ""));//临加班次
+        map.put("ljbc", culateService.culateLjbc(lists, ""));//临加班次
         double ljgl = culateService.culateLjgl(lists);
         map.put("addMileage", ljgl); //临加公里
         Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(list);
@@ -2874,9 +2874,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_ljpm", 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, "抽减");
+        map.put("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_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),ssgl_qt));
         map.put("ssbc", culateService.culateLbbc(list_s));
         double ljgl = culateService.culateLjgl(lists);
         map.put("ljgl", ljgl);
@@ -3082,9 +3082,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
             double ssgl_pc = culateService.culateCJLC(list, "配车");
             double ssgl_by = culateService.culateCJLC(list, "保养");
-            double ssgl_cj = culateService.culateCJLC(list, "抽减");
+            map.put("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_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), ssgl_qt));
+
             map.put("ssbc", culateService.culateLbbc(list));
             map.put("ljgl", ljgl);
             map.put("jhbc", culateService.culateJhbc(list, ""));
@@ -3510,9 +3511,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
         double ssgl_pc = culateService.culateCJLC(list, "配车");
         double ssgl_by = culateService.culateCJLC(list, "保养");
-        double ssgl_cj = culateService.culateCJLC(list, "抽减");
+        map.put("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_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), ssgl_qt));
         map.put("ssbc", culateService.culateLbbc(list));
         map.put("ljgl", ljgl);
@@ -66,11 +66,11 @@
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
-								<th colspan="41"><label id="xlmc"></label>线路调度日报</th>
+								<th colspan="42"><label id="xlmc"></label>线路调度日报</th>
 							</tr>
 							<tr>
 								<td rowspan="3"><span>路线</span></td>
-								<td colspan="17">全日营运里程（公里）</td>
+								<td colspan="18">全日营运里程（公里）</td>
 								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
@@ -79,7 +79,7 @@
 								<td rowspan="2"><span >实驶</span></td>
 								<td rowspan="2"><span>少驶公里</span></td>
 								<td rowspan="2"><span>少驶班次</span></td>
-								<td colspan="12">少驶原因（公里）</td>
+								<td colspan="13">少驶原因（公里）</td>
 								<td rowspan="2"><span >临加公里</span></td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
@@ -102,6 +102,7 @@
 								<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>
@@ -544,6 +545,7 @@
 			<td>{{obj.ssgl_qh}}</td>
 			<td>{{obj.ssgl_yw}}</td>
 			<td>{{obj.ssgl_ljpm}}</td>
+			<td>{{obj.ssgl_cj}}</td>
 			<td>{{obj.ssgl_other}}</td>
 			<td>{{obj.ljgl}}</td>
 			<td>{{obj.jhbc}}</td>
@@ -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>
@@ -100,7 +100,7 @@
 								<td rowspan="2"><label>实际空</label><label>驶公里</label></td>
 								<td rowspan="2"><span>少驶公里</span></td>
 								<td rowspan="2"><span>少驶班次</span></td>
-								<td colspan="12">少驶原因（公里）</td>
+								<td colspan="13">少驶原因（公里）</td>
 								<td colspan="2">临加公里</td>
 								<td colspan="3">计划班次</td>
 								<td colspan="3">实际班次</td>
@@ -123,6 +123,7 @@
 								<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>
@@ -437,6 +438,7 @@
 			<td>{{obj.ssgl_qh}}</td>
 			<td>{{obj.ssgl_yw}}</td>
 			<td>{{obj.ssgl_ljpm}}</td>
+			<td>{{obj.ssgl_cj}}</td>
 			<td>{{obj.ssgl_other}}</td>
 			<td>{{obj.ljgl}}</td>
 			<td>{{obj.ljks}}</td>
@@ -464,7 +466,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