潘钊 / bsth_control · Commits

Commit f55db84b7b4d9f6280e7e39c1740a587aed6a799

Authored by 娄高锋
2 parents 1c7cc4f7 180e6f85
build: skipped

Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 1 changed file with 5 additions and 1 deletions
src/main/java/com/bsth/service/impl/TrafficManageServiceImpl.java
  View file @f55db84
... ... @@ -1005,7 +1005,7 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1005 1005 ttInfoDetail = ttInfoDetailIterator.next();
1006 1006 bcType = ttInfoDetail.getBcType();
1007 1007 sxx = ttInfoDetail.getXlDir();
1008   - // 进出场班次
  1008 + // 进出场班次的里程，加入总里程
1009 1009 if(bcType.equals("in") || bcType.equals("out")){
1010 1010 // 进出班次的计划里程，算空驶里程
1011 1011 emptyLc = ttInfoDetail.getJhlc();
... ... @@ -1013,6 +1013,10 @@ public class TrafficManageServiceImpl implements TrafficManageService{
1013 1013 zlc += emptyLc;
1014 1014 continue;
1015 1015 }
  1016 + // 不是正常班次，不传到运管处
  1017 + if(!bcType.equals("normal")){
  1018 + continue;
  1019 + }
1016 1020 // 如果发车时间格式错误，忽略此条
1017 1021 if(changeTimeFormat(ttInfoDetail) == null){
1018 1022 continue;
... ...