Commit ffbca700be3fc97127e411b83d04b2762023e663
1 parent
9c1e5f08
1
Showing
2 changed files
with
8 additions
and
4 deletions
src/main/java/com/bsth/data/zndd/AutomaticSch.java
| ... | ... | @@ -229,9 +229,11 @@ public class AutomaticSch { |
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | - sr.setFcsjActual(sfsj); | |
| 233 | - ts(addStationPeople(sr, "SFTZ_1", 0L)); | |
| 234 | - LogerWait("实发调整",sr); | |
| 232 | + if (sfsj != null){ | |
| 233 | + sr.setFcsjActual(sfsj); | |
| 234 | + ts(addStationPeople(sr, "SFTZ_1", 0L)); | |
| 235 | + LogerWait("实发调整",sr); | |
| 236 | + } | |
| 235 | 237 | } |
| 236 | 238 | } |
| 237 | 239 | } |
| ... | ... | @@ -433,7 +435,7 @@ public class AutomaticSch { |
| 433 | 435 | //findByNbbm车辆索引获取的班次 |
| 434 | 436 | Map<String, List<ScheduleRealInfo>> groupedByCity = new HashMap<>(); |
| 435 | 437 | if(System.currentTimeMillis() < DateUtils.getTimestamp() + (1000 * 60 * 60 * 20)){ |
| 436 | - logger.info("未到8点----"+(DateUtils.getTimestamp() + (1000 * 60 * 60 * 20))); | |
| 438 | + logger.info("未到晚上8点----"+(DateUtils.getTimestamp() + (1000 * 60 * 60 * 20))); | |
| 437 | 439 | return; |
| 438 | 440 | } |
| 439 | 441 | ... | ... |
src/main/resources/static/pages/home.html
| ... | ... | @@ -66,6 +66,8 @@ |
| 66 | 66 | <li><span class="label s_c_change">修改</span>1.智能调度实发二次调整刷新页面-后续程序上会对这块进行更新,已撤销的班次,你手动再次撤销会刷新这个班次不会再提示无法撤销。</li> |
| 67 | 67 | <li><span class="label s_c_change">修改</span>2.末二班车提示上线</li> |
| 68 | 68 | <li><span class="label s_c_change">修改</span>3.交互屏催发接口修复</li> |
| 69 | + <li><span class="label s_c_change">修改</span>4.行车路单有未实到的班次,导出的时候显示计划公里</li> | |
| 70 | + <li><span class="label s_c_change">修改</span>5.自动调度实发未发只判断有rfid的班次</li> | |
| 69 | 71 | |
| 70 | 72 | </ul> |
| 71 | 73 | ... | ... |