潘钊 / bsth_control · Commits

Commit 943507bcf3757078c97ee7f9acd919d545eff253

Authored by ljq
1 parent ee5b1569
build: skipped

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

2.调度日报里面的少驶原因（公里）加入抽减类型
Inline Side-by-side
Showing 8 changed files with 20 additions and 15 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @943507b
... ... @@ -2233,14 +2233,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2233 2233 map.put("jhbc", culateService.culateJhbc(list, ""));//计划班次
2234 2234 map.put("jhlc", Arith.add(culateService.culateJhgl(list),
2235 2235 culateService.culateJhJccgl(list))); //计划总里程
2236   - map.put("cjbc", culateService.culateLbbc_yy_ks(list));//烂班班次
  2236 + map.put("cjbc", culateService.culateLbbc(list));//烂班班次
2237 2237 map.put("remMileage", culateService.culateLbgl(list)); //烂班公里
2238 2238 Map<String,Double> remmap = culateService.culateLbgl_yy_ks(list);
2239 2239 map.put("remMileage_yy", remmap.get("remMileage_yy")); //营运烂班公里
2240 2240 map.put("remMileage_ks", remmap.get("remMileage_ks")); //空驶烂班公里
2241 2241  
2242 2242  
2243   - map.put("ljbc", culateService.culateLjbc_yy_ks(lists, ""));//临加班次
  2243 + map.put("ljbc", culateService.culateLjbc(lists, ""));//临加班次
2244 2244 double ljgl = culateService.culateLjgl(lists);
2245 2245 map.put("addMileage", ljgl); //临加公里
2246 2246 Map<String,Double> ljmap = culateService.culateLjgl_yy_ks(list);
... ... @@ -2874,9 +2874,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
2874 2874 map.put("ssgl_ljpm", culateService.culateCJLC(list_s, "路救抛锚"));
2875 2875 double ssgl_pc = culateService.culateCJLC(list_s, "配车");
2876 2876 double ssgl_by = culateService.culateCJLC(list_s, "保养");
2877   - double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
  2877 + map.put("ssgl_cj", culateService.culateCJLC(list_s, "抽减"));
2878 2878 double ssgl_qt = culateService.culateCJLC(list_s, "其他");
2879   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  2879 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by),ssgl_qt));
2880 2880 map.put("ssbc", culateService.culateLbbc(list_s));
2881 2881 double ljgl = culateService.culateLjgl(lists);
2882 2882 map.put("ljgl", ljgl);
... ... @@ -3082,9 +3082,10 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3082 3082 map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
3083 3083 double ssgl_pc = culateService.culateCJLC(list, "配车");
3084 3084 double ssgl_by = culateService.culateCJLC(list, "保养");
3085   - double ssgl_cj = culateService.culateCJLC(list, "抽减");
  3085 + map.put("ssgl_cj", culateService.culateCJLC(list, "抽减"));
3086 3086 double ssgl_qt = culateService.culateCJLC(list, "其他");
3087   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  3087 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), ssgl_qt));
  3088 +
3088 3089 map.put("ssbc", culateService.culateLbbc(list));
3089 3090 map.put("ljgl", ljgl);
3090 3091 map.put("jhbc", culateService.culateJhbc(list, ""));
... ... @@ -3510,9 +3511,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
3510 3511 map.put("ssgl_ljpm", culateService.culateCJLC(list, "路救抛锚"));
3511 3512 double ssgl_pc = culateService.culateCJLC(list, "配车");
3512 3513 double ssgl_by = culateService.culateCJLC(list, "保养");
3513   - double ssgl_cj = culateService.culateCJLC(list, "抽减");
  3514 + map.put("ssgl_cj", culateService.culateCJLC(list, "抽减"));
3514 3515 double ssgl_qt = culateService.culateCJLC(list, "其他");
3515   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  3516 + map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), ssgl_qt));
3516 3517  
3517 3518 map.put("ssbc", culateService.culateLbbc(list));
3518 3519 map.put("ljgl", ljgl);
... ...
src/main/resources/static/pages/forms/mould/scheduleDaily.xls
View file @943507b
No preview for this file type
src/main/resources/static/pages/forms/mould/scheduleDaily_df.xls
View file @943507b
No preview for this file type
src/main/resources/static/pages/forms/mould/scheduleDaily_m.xls
View file @943507b
No preview for this file type
src/main/resources/static/pages/forms/mould/statisticsDaily_2.xls
View file @943507b
No preview for this file type
src/main/resources/static/pages/forms/mould/statisticsDaily_4.xls
View file @943507b
No preview for this file type
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @943507b
... ... @@ -66,11 +66,11 @@
66 66 <table class="table table-bordered table-hover table-checkable" id="forms">
67 67 <thead>
68 68 <tr>
69   - <th colspan="41"><label id="xlmc"></label>线路调度日报</th>
  69 + <th colspan="42"><label id="xlmc"></label>线路调度日报</th>
70 70 </tr>
71 71 <tr>
72 72 <td rowspan="3"><span>路线</span></td>
73   - <td colspan="17">全日营运里程（公里）</td>
  73 + <td colspan="18">全日营运里程（公里）</td>
74 74 <td colspan="15">全日营运班次</td>
75 75 <td colspan="9">大间隔情况</td>
76 76 </tr>
... ... @@ -79,7 +79,7 @@
79 79 <td rowspan="2"><span >实驶</span></td>
80 80 <td rowspan="2"><span>少驶公里</span></td>
81 81 <td rowspan="2"><span>少驶班次</span></td>
82   - <td colspan="12">少驶原因（公里）</td>
  82 + <td colspan="13">少驶原因（公里）</td>
83 83 <td rowspan="2"><span >临加公里</span></td>
84 84 <td colspan="3">计划班次</td>
85 85 <td colspan="3">实际班次</td>
... ... @@ -102,6 +102,7 @@
102 102 <td><span>气候</span></td>
103 103 <td><span>援外</span></td>
104 104 <td><span>路救抛锚</span></td>
  105 + <td><span>抽减</span></td>
105 106 <td><span>其他</span></td>
106 107 <td><span>全日</span></td>
107 108 <td><span>早高峰</span></td>
... ... @@ -544,6 +545,7 @@
544 545 <td>{{obj.ssgl_qh}}</td>
545 546 <td>{{obj.ssgl_yw}}</td>
546 547 <td>{{obj.ssgl_ljpm}}</td>
  548 + <td>{{obj.ssgl_cj}}</td>
547 549 <td>{{obj.ssgl_other}}</td>
548 550 <td>{{obj.ljgl}}</td>
549 551 <td>{{obj.jhbc}}</td>
... ...
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @943507b
... ... @@ -81,12 +81,12 @@
81 81 <table class="table table-bordered table-hover table-checkable" id="forms">
82 82 <thead>
83 83 <tr>
84   - <th colspan="45"><label id="tjrq"></label> 线路统计日报</th>
  84 + <th colspan="46"><label id="tjrq"></label> 线路统计日报</th>
85 85 </tr>
86 86 <tr>
87 87 <td rowspan="3"><span >分公司</span></td>
88 88 <td rowspan="3"><span >路线名</span></td>
89   - <td colspan="22">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
  89 + <td colspan="23">全日营运里程（公里）(注:实际营运里程、实际空驶里程、实际总里程均已包含临加里程)</td>
90 90 <td colspan="15">全日营运班次</td>
91 91 <td colspan="9">大间隔情况</td>
92 92 </tr>
... ... @@ -100,7 +100,7 @@
100 100 <td rowspan="2"><label>实际空</label><label>驶公里</label></td>
101 101 <td rowspan="2"><span>少驶公里</span></td>
102 102 <td rowspan="2"><span>少驶班次</span></td>
103   - <td colspan="12">少驶原因（公里）</td>
  103 + <td colspan="13">少驶原因（公里）</td>
104 104 <td colspan="2">临加公里</td>
105 105 <td colspan="3">计划班次</td>
106 106 <td colspan="3">实际班次</td>
... ... @@ -123,6 +123,7 @@
123 123 <td><span>气候</span></td>
124 124 <td><span>援外</span></td>
125 125 <td><span>路救抛锚</span></td>
  126 + <td><span>抽减</span></td>
126 127 <td><span>其他</span></td>
127 128 <td><span>营运</span></td>
128 129 <td><span>空驶</span></td>
... ... @@ -437,6 +438,7 @@
437 438 <td>{{obj.ssgl_qh}}</td>
438 439 <td>{{obj.ssgl_yw}}</td>
439 440 <td>{{obj.ssgl_ljpm}}</td>
  441 + <td>{{obj.ssgl_cj}}</td>
440 442 <td>{{obj.ssgl_other}}</td>
441 443 <td>{{obj.ljgl}}</td>
442 444 <td>{{obj.ljks}}</td>
... ... @@ -464,7 +466,7 @@
464 466 {{/each}}
465 467 {{if list.length == 0}}
466 468 <tr>
467   - <td colspan="45"><h6 class="muted">没有找到相关数据</h6></td>
  469 + <td colspan="46"><h6 class="muted">没有找到相关数据</h6></td>
468 470 </tr>
469 471 {{/if}}
470 472 </script>
471 473 \ No newline at end of file
... ...