潘钊 / bsth_control · Commits

Commit 7555fe727e0d500bda7a5b18af36c43b79aa684b

Authored by 娄高锋
1 parent 5270a177

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

Inline Side-by-side
Showing 8 changed files with 79 additions and 93 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @7555fe7
... ... @@ -2123,7 +2123,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2123 2123 if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("路阻") != -1){
2124 2124 lzbc++;
2125 2125 // lzlc = lzlc.add(lc);
2126   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("吊慢") != -1){
  2126 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("借调") != -1){
2127 2127 dmbc++;
2128 2128 // dmlc = dmlc.add(lc);
2129 2129 }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("故障") != -1){
... ... @@ -2132,25 +2132,25 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2132 2132 }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("纠纷") != -1){
2133 2133 jfbc++;
2134 2134 // jflc = jflc.add(lc);
2135   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("肇事") != -1){
  2135 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("事故") != -1){
2136 2136 zsbc++;
2137 2137 // zslc = zslc.add(lc);
2138 2138 }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺人") != -1){
2139 2139 qrbc++;
2140 2140 // qrlc = qrlc.add(lc);
2141   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("缺车") != -1){
  2141 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("验车") != -1){
2142 2142 qcbc++;
2143 2143 // qclc = qclc.add(lc);
2144   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("客稀") != -1){
  2144 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("保养") != -1){
2145 2145 kxbc++;
2146 2146 // kxlc = kxlc.add(lc);
2147   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
  2147 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("天气") != -1){
2148 2148 qhbc++;
2149 2149 // qhlc = qhlc.add(lc);
2150   - }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
  2150 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("支援") != -1){
2151 2151 wybc++;
2152 2152 // wylc = wylc.add(lc);
2153   - } else {
  2153 + }else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("其他") != -1){
2154 2154 qtbc++;
2155 2155 // qtlc = qtlc.add(lc);
2156 2156 }
... ... @@ -2171,19 +2171,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2171 2171  
2172 2172 sjlc = new BigDecimal(culateService.culateSjgl(tempList) + culateService.culateLjgl(tempList));
2173 2173 lzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "路阻"));
2174   - dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "吊慢"));
  2174 + dmlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "借调"));
2175 2175 gzlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "故障"));
2176 2176 jflc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "纠纷"));
2177   - zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "肇事"));
  2177 + zslc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "事故"));
2178 2178 qrlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺人"));
2179   - qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "缺车"));
2180   - kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "客稀"));
2181   - qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "气候"));
2182   - wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "援外"));
2183   - qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "配车")).add(
2184   - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"))).add(
2185   - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "抽减"))).add(
2186   - new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他")));
  2179 + qclc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "验车"));
  2180 + kxlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "保养"));
  2181 + qhlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "天气"));
  2182 + wylc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "支援"));
  2183 + qtlc = new BigDecimal(culateService.culateCJLC(keyMap.get(key), "其他"));
2187 2184  
2188 2185 boolean flag = true;
2189 2186 if(jhlc.doubleValue() == 0d){
... ...
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
  View file @7555fe7
... ... @@ -2618,20 +2618,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2618 2618 double lbgl = culateService.culateLbgl(list_s);
2619 2619 map.put("ssgl", lbgl);
2620 2620 map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
2621   - map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
  2621 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "借调"));
2622 2622 map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
2623 2623 map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
2624   - map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
  2624 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "事故"));
2625 2625 map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
2626   - map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
2627   - map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
2628   - map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
2629   - map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
2630   - double ssgl_pc = culateService.culateCJLC(list_s, "配车");
2631   - double ssgl_by = culateService.culateCJLC(list_s, "保养");
2632   - double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
2633   - double ssgl_qt = culateService.culateCJLC(list_s, "其他");
2634   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  2626 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "验车"));
  2627 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "保养"));
  2628 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "天气"));
  2629 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "支援"));
  2630 + map.put("ssgl_other", culateService.culateCJLC(list_s, "其他"));
2635 2631 map.put("ssbc", culateService.culateLbbc(list_s));
2636 2632 double ljgl = culateService.culateLjgl(lists);
2637 2633 map.put("ljgl", ljgl);
... ... @@ -2715,20 +2711,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2715 2711 double lbgl = culateService.culateLbgl(list_s);
2716 2712 map.put("ssgl", lbgl);
2717 2713 map.put("ssgl_lz", culateService.culateCJLC(list_s, "路阻"));
2718   - map.put("ssgl_dm", culateService.culateCJLC(list_s, "吊慢"));
  2714 + map.put("ssgl_dm", culateService.culateCJLC(list_s, "借调"));
2719 2715 map.put("ssgl_gz", culateService.culateCJLC(list_s, "故障"));
2720 2716 map.put("ssgl_jf", culateService.culateCJLC(list_s, "纠纷"));
2721   - map.put("ssgl_zs", culateService.culateCJLC(list_s, "肇事"));
  2717 + map.put("ssgl_zs", culateService.culateCJLC(list_s, "事故"));
2722 2718 map.put("ssgl_qr", culateService.culateCJLC(list_s, "缺人"));
2723   - map.put("ssgl_qc", culateService.culateCJLC(list_s, "缺车"));
2724   - map.put("ssgl_kx", culateService.culateCJLC(list_s, "客稀"));
2725   - map.put("ssgl_qh", culateService.culateCJLC(list_s, "气候"));
2726   - map.put("ssgl_yw", culateService.culateCJLC(list_s, "援外"));
2727   - double ssgl_pc = culateService.culateCJLC(list_s, "配车");
2728   - double ssgl_by = culateService.culateCJLC(list_s, "保养");
2729   - double ssgl_cj = culateService.culateCJLC(list_s, "抽减");
2730   - double ssgl_qt = culateService.culateCJLC(list_s, "其他");
2731   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  2719 + map.put("ssgl_qc", culateService.culateCJLC(list_s, "验车"));
  2720 + map.put("ssgl_kx", culateService.culateCJLC(list_s, "保养"));
  2721 + map.put("ssgl_qh", culateService.culateCJLC(list_s, "天气"));
  2722 + map.put("ssgl_yw", culateService.culateCJLC(list_s, "支援"));
  2723 + map.put("ssgl_other", culateService.culateCJLC(list_s, "其他"));
2732 2724 map.put("ssbc", culateService.culateLbbc(list_s));
2733 2725 double ljgl = culateService.culateLjgl(lists);
2734 2726 map.put("ljgl", ljgl);
... ... @@ -2953,20 +2945,16 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl<ScheduleRealInf
2953 2945 map.put("zt", 1);
2954 2946 }
2955 2947 map.put("ssgl_lz", culateService.culateCJLC(list, "路阻"));
2956   - map.put("ssgl_dm", culateService.culateCJLC(list, "吊慢"));
  2948 + map.put("ssgl_dm", culateService.culateCJLC(list, "借调"));
2957 2949 map.put("ssgl_gz", culateService.culateCJLC(list, "故障"));
2958 2950 map.put("ssgl_jf", culateService.culateCJLC(list, "纠纷"));
2959   - map.put("ssgl_zs", culateService.culateCJLC(list, "肇事"));
  2951 + map.put("ssgl_zs", culateService.culateCJLC(list, "事故"));
2960 2952 map.put("ssgl_qr", culateService.culateCJLC(list, "缺人"));
2961   - map.put("ssgl_qc", culateService.culateCJLC(list, "缺车"));
2962   - map.put("ssgl_kx", culateService.culateCJLC(list, "客稀"));
2963   - map.put("ssgl_qh", culateService.culateCJLC(list, "气候"));
2964   - map.put("ssgl_yw", culateService.culateCJLC(list, "援外"));
2965   - double ssgl_pc = culateService.culateCJLC(list, "配车");
2966   - double ssgl_by = culateService.culateCJLC(list, "保养");
2967   - double ssgl_cj = culateService.culateCJLC(list, "抽减");
2968   - double ssgl_qt = culateService.culateCJLC(list, "其他");
2969   - map.put("ssgl_other", Arith.add(Arith.add(ssgl_pc, ssgl_by), Arith.add(ssgl_cj, ssgl_qt)));
  2953 + map.put("ssgl_qc", culateService.culateCJLC(list, "验车"));
  2954 + map.put("ssgl_kx", culateService.culateCJLC(list, "保养"));
  2955 + map.put("ssgl_qh", culateService.culateCJLC(list, "天气"));
  2956 + map.put("ssgl_yw", culateService.culateCJLC(list, "支援"));
  2957 + map.put("ssgl_other", culateService.culateCJLC(list, "其他"));
2970 2958  
2971 2959 map.put("ssbc", culateService.culateLbbc(list));
2972 2960 map.put("ljgl", ljgl);
... ...
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
  View file @7555fe7
... ... @@ -31,7 +31,8 @@ public class CulateMileageServiceImpl implements CulateMileageService{
31 31 @Override
32 32 public List<Map<String, Object>> jobFwqk(List<ScheduleRealInfo> lists) {
33 33 // TODO Auto-generated method stub
34   - String[] lblxs = {"配车", "保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
  34 +// String[] lblxs = {"配车","保养","故障","肇事","路阻","纠纷","缺人","客稀","缺车","气候","援外","吊慢","抽减","其他" };
  35 + String[] lblxs = {"路阻","借调","故障","纠纷","事故","缺人","验车","保养","天气","支援","其他"};
35 36 List<Map<String, Object>> list=new ArrayList<Map<String,Object>>();
36 37 for (int i = 0; i < lists.size(); i++) {
37 38 ScheduleRealInfo scheduleRealInfo = lists.get(i);
... ...
src/main/resources/static/pages/forms/mh_sj/scheduleDaily/scheduleDaily_mh.html
  View file @7555fe7
... ... @@ -95,16 +95,16 @@ word-wrap: break-word;
95 95 <td colspan="5" rowspan="2">原因</td>
96 96 </tr>
97 97 <tr>
98   - <td><span >路阻</span></td>
99   - <td><span>吊慢</span></td>
100   - <td><span >故障</span></td>
101   - <td><span >纠纷</span></td>
102   - <td><span >肇事</span></td>
  98 + <td><span>路阻</span></td>
  99 + <td><span>借调</span></td>
  100 + <td><span>故障</span></td>
  101 + <td><span>纠纷</span></td>
  102 + <td><span>事故</span></td>
103 103 <td><span>缺人</span></td>
104   - <td><span>缺车</span></td>
105   - <td><span >客稀</span></td>
106   - <td><span>气候</span></td>
107   - <td><span>援外</span></td>
  104 + <td><span>验车</span></td>
  105 + <td><span>保养</span></td>
  106 + <td><span>天气</span></td>
  107 + <td><span>支援</span></td>
108 108 <td><span>其他</span></td>
109 109 <td><span ><c>全日</c></span></td>
110 110 <td><span >早高峰</span></td>
... ...
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @7555fe7
... ... @@ -33,15 +33,15 @@
33 33 <span class="item-label" style="width: 80px;">烂班原因: </span>
34 34 <input class="form-control" type="checkbox" id="totalLb" style="width: 20px;" checked="true"/>全选
35 35 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="0" checked="true"/>路阻
36   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="1" checked="true"/>吊慢
  36 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="1" checked="true"/>借调
37 37 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="2" checked="true"/>故障
38 38 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="3" checked="true"/>纠纷
39   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="4" checked="true"/>肇事
  39 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="4" checked="true"/>事故
40 40 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="5" checked="true"/>缺人
41   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="6" checked="true"/>缺车
42   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>客稀
43   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>气候
44   - <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>援外
  41 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="6" checked="true"/>验车
  42 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="7" checked="true"/>保养
  43 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="8" checked="true"/>天气
  44 + <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="9" checked="true"/>支援
45 45 <input class="form-control" type="checkbox" name="reason" style="width: 20px;" value="10" checked="true"/>其他
46 46 </div>
47 47 <div style="margin-top: 5px"></div>
... ... @@ -538,15 +538,15 @@
538 538 <tr>
539 539 <th class="hidden"></th>
540 540 {{if reason[0].checked == true}}<th colspan="3">路阻</th>{{/if}}
541   - {{if reason[1].checked == true}}<th colspan="3">吊慢</th>{{/if}}
  541 + {{if reason[1].checked == true}}<th colspan="3">借调</th>{{/if}}
542 542 {{if reason[2].checked == true}}<th colspan="3">故障</th>{{/if}}
543 543 {{if reason[3].checked == true}}<th colspan="3">纠纷</th>{{/if}}
544   - {{if reason[4].checked == true}}<th colspan="3">肇事</th>{{/if}}
  544 + {{if reason[4].checked == true}}<th colspan="3">事故</th>{{/if}}
545 545 {{if reason[5].checked == true}}<th colspan="3">缺人</th>{{/if}}
546   - {{if reason[6].checked == true}}<th colspan="3">缺车</th>{{/if}}
547   - {{if reason[7].checked == true}}<th colspan="3">客稀</th>{{/if}}
548   - {{if reason[8].checked == true}}<th colspan="3">气候</th>{{/if}}
549   - {{if reason[9].checked == true}}<th colspan="3">援外</th>{{/if}}
  546 + {{if reason[6].checked == true}}<th colspan="3">验车</th>{{/if}}
  547 + {{if reason[7].checked == true}}<th colspan="3">保养</th>{{/if}}
  548 + {{if reason[8].checked == true}}<th colspan="3">天气</th>{{/if}}
  549 + {{if reason[9].checked == true}}<th colspan="3">支援</th>{{/if}}
550 550 {{if reason[10].checked == true}}<th colspan="3">其他</th>{{/if}}
551 551 </tr>
552 552 <tr>
... ...
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @7555fe7
... ... @@ -92,15 +92,15 @@
92 92 </tr>
93 93 <tr>
94 94 <td><span>路阻</span></td>
95   - <td><span>吊慢</span></td>
  95 + <td><span>借调</span></td>
96 96 <td><span>故障</span></td>
97 97 <td><span>纠纷</span></td>
98   - <td><span>肇事</span></td>
  98 + <td><span>事故</span></td>
99 99 <td><span>缺人</span></td>
100   - <td><span>缺车</span></td>
101   - <td><span>客稀</span></td>
102   - <td><span>气候</span></td>
103   - <td><span>援外</span></td>
  100 + <td><span>验车</span></td>
  101 + <td><span>保养</span></td>
  102 + <td><span>天气</span></td>
  103 + <td><span>支援</span></td>
104 104 <td><span>其他</span></td>
105 105 <td><span>全日</span></td>
106 106 <td><span>早高峰</span></td>
... ...
src/main/resources/static/pages/forms/statement/scheduleDailyQp.html
  View file @7555fe7
... ... @@ -74,15 +74,15 @@
74 74 </tr>
75 75 <tr>
76 76 <td>路阻</td>
77   - <td>吊慢</td>
  77 + <td>借调</td>
78 78 <td>故障</td>
79 79 <td>纠纷</td>
80   - <td>肇事</td>
  80 + <td>事故</td>
81 81 <td>缺人</td>
82   - <td>缺车</td>
83   - <td>客稀</td>
84   - <td>气候</td>
85   - <td>援外</td>
  82 + <td>验车</td>
  83 + <td>保养</td>
  84 + <td>天气</td>
  85 + <td>支援</td>
86 86 <td>其他</td>
87 87 <td><c>全日</c></td>
88 88 <td>早高峰</td>
... ...
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @7555fe7
... ... @@ -111,16 +111,16 @@
111 111 <td rowspan="2">原因</td>
112 112 </tr>
113 113 <tr>
114   - <td><span >路阻</span></td>
115   - <td><span>吊慢</span></td>
116   - <td><span >故障</span></td>
117   - <td><span >纠纷</span></td>
118   - <td><span >肇事</span></td>
  114 + <td><span>路阻</span></td>
  115 + <td><span>借调</span></td>
  116 + <td><span>故障</span></td>
  117 + <td><span>纠纷</span></td>
  118 + <td><span>事故</span></td>
119 119 <td><span>缺人</span></td>
120   - <td><span>缺车</span></td>
121   - <td><span >客稀</span></td>
122   - <td><span>气候</span></td>
123   - <td><span>援外</span></td>
  120 + <td><span>验车</span></td>
  121 + <td><span>保养</span></td>
  122 + <td><span>天气</span></td>
  123 + <td><span>支援</span></td>
124 124 <td><span>其他</span></td>
125 125 <td><span>营运</span></td>
126 126 <td><span>空驶</span></td>
... ...