潘钊 / bsth_control · Commits

Commit 77550be5e57595f501da56a2016e970473cb2970

Authored by 娄高锋
1 parent 5acbb9c8

LGF 报表

Inline Side-by-side
Showing 2 changed files with 15 additions and 10 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @77550be
... ... @@ -1102,7 +1102,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1102 1102 }
1103 1103 for(String key : keyMap.keySet()){
1104 1104 Map<String, Object> tempMap = new HashMap<String, Object>();
1105   - int jhbc = 0, sjbc = 0, kbc = 0, mbc = 0;
  1105 + int jhbc = 0, sjbc = 0, wdfz = 0;
1106 1106 long jhdf = 0l, sjdf = 0l, wddf1 = 0l, wddf2 = 0l;
1107 1107 long jhfc = 0l, sjfc = 0l, wdfc1 = 0l, wdfc2 = 0l;
1108 1108 long jhys = 0l, sjys = 0l, yssjMax = 0l, yssjMin = 0l;
... ... @@ -1127,10 +1127,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1127 1127 yssj += schedule.getZdsjActualTime() - schedule.getFcsjActualTime();
1128 1128 if(schedule.getFcsjActualTime() - schedule.getFcsjT() < 0){
1129 1129 wdfc1 += schedule.getFcsjT() - schedule.getFcsjActualTime();
1130   - kbc++;
  1130 +// kbc++;
1131 1131 } else if(schedule.getFcsjActualTime() - schedule.getFcsjT() > 0){
1132 1132 wdfc2 += schedule.getFcsjActualTime() - schedule.getFcsjT();
1133   - mbc++;
  1133 +// mbc++;
1134 1134 }
1135 1135  
1136 1136 if(schedule.getDfsj() != null){
... ... @@ -1197,8 +1197,16 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1197 1197 tempMap.put("pjys", "0分");
1198 1198 tempMap.put("pjtz", "0分");
1199 1199 }
1200   - tempMap.put("kbc", kbc);
1201   - tempMap.put("mbc", mbc);
  1200 +// tempMap.put("kbc", kbc);
  1201 +// tempMap.put("mbc", mbc);
  1202 + if(!tempMap.get("jhfc").toString().equals("/") && !tempMap.get("sjfc").toString().equals("/")){
  1203 + String[] temp1 = tempMap.get("jhfc").toString().split(":");
  1204 + String[] temp2 = tempMap.get("sjfc").toString().split(":");
  1205 + tempMap.put("wdfz", (Integer.valueOf(temp2[0])*60 + Integer.valueOf(temp2[1]))
  1206 + - (Integer.valueOf(temp1[0])*60 + Integer.valueOf(temp1[1])));
  1207 + }else{
  1208 + tempMap.put("wdfz", "/");
  1209 + }
1202 1210 tempMap.put("jhys", jhys);
1203 1211 tempMap.put("sjys", sjys);
1204 1212 tempMap.put("yssjMin", yssjMin);
... ...
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
  View file @77550be
... ... @@ -121,7 +121,7 @@
121 121 <th rowspan="2">日期</th>
122 122 <th colspan="4">到达时间</th>
123 123 <th colspan="4">发车时间</th>
124   - <th colspan="2">误点率</th>
  124 + <th rowspan="2">误点分钟</th>
125 125 <th colspan="5">运送时间</th>
126 126 <th colspan="5">停站时间</th>
127 127 </tr>
... ... @@ -134,8 +134,6 @@
134 134 <th>实际</th>
135 135 <th>平均提前</th>
136 136 <th>平均延误</th>
137   - <th>快</th>
138   - <th>慢</th>
139 137 <th>计划</th>
140 138 <th>实际</th>
141 139 <th>最快</th>
... ... @@ -419,8 +417,7 @@
419 417 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td>
420 418 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td>
421 419 {{/if}}
422   - <td>{{obj.kbc}}</td>
423   - <td>{{obj.mbc}}</td>
  420 + <td>{{obj.wdfz}}</td>
424 421 <td>{{obj.jhys}}</td>
425 422 <td>{{obj.sjys}}</td>
426 423 <td>{{obj.yssjMin}}</td>
... ...