Commit 7651317ae3f6dbc4b79f451b387c295137afafbb
1 parent
6b4f9980
update..
Showing
2 changed files
with
37 additions
and
2 deletions
src/main/java/com/bsth/data/schedule/SchAttrCalculator.java
| @@ -221,7 +221,8 @@ public class SchAttrCalculator { | @@ -221,7 +221,8 @@ public class SchAttrCalculator { | ||
| 221 | for (ScheduleRealInfo sch : list) { | 221 | for (ScheduleRealInfo sch : list) { |
| 222 | //如果是出站既出场，忽略出场班次 | 222 | //如果是出站既出场，忽略出场班次 |
| 223 | if (outConfig == 2 && sch.getBcType().equals("out") | 223 | if (outConfig == 2 && sch.getBcType().equals("out") |
| 224 | - && (!limitPark || park.equals(sch.getQdzCode()))) | 224 | + && (!limitPark || park.equals(sch.getQdzCode())) |
| 225 | + && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0)) | ||
| 225 | continue; | 226 | continue; |
| 226 | 227 | ||
| 227 | //忽略烂班 | 228 | //忽略烂班 |
| @@ -259,7 +260,8 @@ public class SchAttrCalculator { | @@ -259,7 +260,8 @@ public class SchAttrCalculator { | ||
| 259 | for (ScheduleRealInfo sch : list) { | 260 | for (ScheduleRealInfo sch : list) { |
| 260 | //如果是出站既出场，忽略出场班次 | 261 | //如果是出站既出场，忽略出场班次 |
| 261 | if (outConfig == 2 && isInout(sch) | 262 | if (outConfig == 2 && isInout(sch) |
| 262 | - && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode()))) | 263 | + && (!limitPark || park.equals(sch.getQdzCode()) || park.equals(sch.getZdzCode())) |
| 264 | + && (sch.getBcsj()==0 || sch.getJhlcOrig().intValue()==0)) | ||
| 263 | continue; | 265 | continue; |
| 264 | 266 | ||
| 265 | //忽略烂班 | 267 | //忽略烂班 |
src/main/resources/static/pages/summary/fast_and_slow/main.html
| @@ -175,6 +175,39 @@ | @@ -175,6 +175,39 @@ | ||
| 175 | </div> | 175 | </div> |
| 176 | 176 | ||
| 177 | <div class="ct_cont_body"> | 177 | <div class="ct_cont_body"> |
| 178 | + <div> | ||
| 179 | + <table> | ||
| 180 | + <tr> | ||
| 181 | + <td rowspan="3">序号</td> | ||
| 182 | + <td rowspan="3">发车站点</td> | ||
| 183 | + <td rowspan="3">方向</td> | ||
| 184 | + <td colspan="7">发车时间</td> | ||
| 185 | + <td colspan="7">到达时间</td> | ||
| 186 | + </tr> | ||
| 187 | + <tr> | ||
| 188 | + <td rowspan="2">计划发车时间</td> | ||
| 189 | + <td rowspan="2">待发发车时间</td> | ||
| 190 | + <td rowspan="2">实际发车实际</td> | ||
| 191 | + <td colspan="2">计划</td> | ||
| 192 | + <td colspan="2">待发</td> | ||
| 193 | + <td rowspan="2">计划应到时间</td> | ||
| 194 | + <td rowspan="2">待发应到时间</td> | ||
| 195 | + <td rowspan="2">实际到达时间</td> | ||
| 196 | + <td colspan="2">计划</td> | ||
| 197 | + <td colspan="2">待发</td> | ||
| 198 | + </tr> | ||
| 199 | + <tr> | ||
| 200 | + <td>快</td> | ||
| 201 | + <td>慢</td> | ||
| 202 | + <td>快</td> | ||
| 203 | + <td>慢</td> | ||
| 204 | + <td>快</td> | ||
| 205 | + <td>慢</td> | ||
| 206 | + <td>快</td> | ||
| 207 | + <td>慢</td> | ||
| 208 | + </tr> | ||
| 209 | + </table> | ||
| 210 | + </div> | ||
| 178 | </div> | 211 | </div> |
| 179 | </div> | 212 | </div> |
| 180 | </div> | 213 | </div> |