潘钊 / bsth_control · Commits

Commit f7d60e3571ddba7a9bb389f7ea441a7877519614

Authored by 娄高锋
1 parent 78adddad

首末班准点率 统一快1慢2

Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
  View file @f7d60e3
... ... @@ -1633,7 +1633,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1633 1633 temp.put("sjfcLast0", s4.getFcsjActual());
1634 1634 temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
1635 1635 jhbc += 2;
1636   - if(delayFirst0 <= 1l && delayFirst0 >= -3l){
  1636 + if(delayFirst0 <= 1l && delayFirst0 >= -2l){
1637 1637 sjbc++;
1638 1638 } else {
1639 1639 Map<String, Object> m = new HashMap<String, Object>();
... ... @@ -1649,7 +1649,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1649 1649 m.put("remarks", s1.getRemarks() + s2.getRemarks());
1650 1650 mapList.add(m);
1651 1651 }
1652   - if(delayLast0 <= 1l && delayLast0 >= -3l){
  1652 + if(delayLast0 <= 1l && delayLast0 >= -2l){
1653 1653 sjbc++;
1654 1654 } else {
1655 1655 Map<String, Object> m = new HashMap<String, Object>();
... ... @@ -1737,6 +1737,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
1737 1737 temp.put("sjfcLast1", "/");
1738 1738 temp.put("delayLast1", "/");
1739 1739 }
  1740 + if((up1.size() == 0 || up2.size() == 0) && (dn1.size() == 0 || dn2.size() == 0))
  1741 + continue;
1740 1742 tempList.add(temp);
1741 1743 }
1742 1744 tempMap.put("map", tempList);
... ...