潘钊 / bsth_control · Commits

Commit d7e44dc6cf670ad0b03043354617c2cc62d411e8

Authored by panzhaov5
1 parent 3506f392

修正 分班出站即出场的小问题

Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
  View file @d7e44dc
... ... @@ -629,7 +629,7 @@ public class DayOfSchedule {
629 629 continue;
630 630  
631 631 //出站既出场，忽略出场班次
632   - if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
  632 + if (outConfig == 2 && temp.getBcType().equals("out") && isEmptyMileage(temp)
633 633 && (!limitPark || parks.contains(temp.getQdzCode())))
634 634 continue;
635 635  
... ... @@ -641,6 +641,10 @@ public class DayOfSchedule {
641 641 return next;
642 642 }
643 643  
  644 + private boolean isEmptyMileage(ScheduleRealInfo sch) {
  645 + return sch.getBcsj() == 0 || sch.getJhlcOrig().intValue() == 0;
  646 + }
  647 +
644 648 /**
645 649 * 下一个班次
646 650 *
... ... @@ -688,7 +692,7 @@ public class DayOfSchedule {
688 692 }
689 693  
690 694 //出站既出场，忽略出场班次
691   - if (outConfig == 2 && temp.getBcType().equals("out") && (temp.getBcsj()==0 || temp.getJhlcOrig().equals(0))
  695 + if (outConfig == 2 && temp.getBcType().equals("out") && isEmptyMileage(temp)
692 696 && (!limitPark || parks.contains(temp.getQdzCode())))
693 697 continue;
694 698  
... ...