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

娄高锋
1 parent 78adddad
Showing 1 changed file with 4 additions and 2 deletions
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
@@ -1633,7 +1633,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast0", s4.getFcsjActual());
 					temp.put("delayLast0", delayLast0>0?"+"+delayLast0:delayLast0);
 					jhbc += 2;
-					if(delayFirst0 <= 1l && delayFirst0 >= -3l){
+					if(delayFirst0 <= 1l && delayFirst0 >= -2l){
 						sjbc++;
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
@@ -1649,7 +1649,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 						m.put("remarks", s1.getRemarks() + s2.getRemarks());
 						mapList.add(m);
 					}
-					if(delayLast0 <= 1l && delayLast0 >= -3l){
+					if(delayLast0 <= 1l && delayLast0 >= -2l){
 						sjbc++;
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
@@ -1737,6 +1737,8 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					temp.put("sjfcLast1", "/");
 					temp.put("delayLast1", "/");
 				}
+				if((up1.size() == 0 || up2.size() == 0) && (dn1.size() == 0 || dn2.size() == 0))
+					continue;
 				tempList.add(temp);
 			}
 			tempMap.put("map", tempList);