Commit f07de4cc71f478faed2b9c68a381dbf338800266
1 parent
c4cbf967
(仅临港)前后车计划实发一致且中间无烂班班次的大间隔不报出
Showing
1 changed file
with
11 additions
and
1 deletions
src/main/java/com/bsth/server_rs/bigdata/BigscreenService.java
| ... | ... | @@ -2706,7 +2706,17 @@ public class BigscreenService { |
| 2706 | 2706 | Map<String, Object> map = calcIntervalMap.get(xlBm); |
| 2707 | 2707 | m.put("gs", gsMap.get(map.get("gsbm").toString())); |
| 2708 | 2708 | m.put("fgs", fgsMap.get(map.get("fgsbm").toString() + "_" + map.get("gsbm").toString())); |
| 2709 | - resList.add(m); | |
| 2709 | + | |
| 2710 | + if(m.containsKey("remark") && m.get("remark").toString().trim().length() > 0){ | |
| 2711 | + | |
| 2712 | + if((""+m.get("jhfc1")).equals(""+m.get("sjfc1")) | |
| 2713 | + && (""+m.get("jhfc2")).equals(""+m.get("sjfc2")) | |
| 2714 | + && (!m.get("remark").toString().contains("中间"))){ //前后车计划实发一致且中间无烂班班次的不报出 | |
| 2715 | + continue; | |
| 2716 | + } | |
| 2717 | + | |
| 2718 | + resList.add(m); | |
| 2719 | + } | |
| 2710 | 2720 | } |
| 2711 | 2721 | } |
| 2712 | 2722 | ... | ... |