Commit 63455da610c21baf7942e7a214864670ecb134f0
Merge branch 'minhang' into pudong
Showing
2 changed files
with
6 additions
and
6 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
| @@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle { | @@ -53,15 +53,15 @@ public class CorrectSignalHandle extends SignalHandle { | ||
| 53 | 53 | ||
| 54 | //（转发的数据不管） | 54 | //（转发的数据不管） |
| 55 | if(gps.getSource() != 0){ | 55 | if(gps.getSource() != 0){ |
| 56 | - //gps=非营运 && 班次=非空驶 ;切换到营运状态 | ||
| 57 | - if(!gps.isService() && | 56 | + //gps=非营运 或走向不对 && 班次=非空驶 ;切换到营运状态 |
| 57 | + if((!gps.isService() || gps.getUpDown() != updown) && | ||
| 58 | !dayOfSchedule.emptyService(task)){ | 58 | !dayOfSchedule.emptyService(task)){ |
| 59 | - gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, null); | 59 | + gpsStatusManager.changeServiceState(gps.getNbbm(), updown, 0, "系统@同步"); |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | //需要切换线路 | 62 | //需要切换线路 |
| 63 | if(!task.getXlBm().equals(gps.getLineId())){ | 63 | if(!task.getXlBm().equals(gps.getLineId())){ |
| 64 | - gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), null); | 64 | + gpsStatusManager.changeLine(gps.getNbbm(), task.getXlBm(), "系统@同步"); |
| 65 | } | 65 | } |
| 66 | } | 66 | } |
| 67 | 67 |
src/main/resources/static/pages/summary/work_hours/list.html
| @@ -263,8 +263,8 @@ | @@ -263,8 +263,8 @@ | ||
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | //日期选择器 | 265 | //日期选择器 |
| 266 | - $('[name=rq_eq]', f).val('2017-07-25'); | ||
| 267 | - flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-25', minDate: '2017-07-01'}); | 266 | + $('[name=rq_eq]', f).val('2017-07-27'); |
| 267 | + flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-07-27', minDate: '2017-07-01'}); | ||
| 268 | 268 | ||
| 269 | var comps; | 269 | var comps; |
| 270 | //构建公司级联下拉框 | 270 | //构建公司级联下拉框 |