Commit f55db84b7b4d9f6280e7e39c1740a587aed6a799

Authored by 娄高锋
2 parents 1c7cc4f7 180e6f85

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

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