diff --git a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java index 0c0b574f2..a96b1cd0c 100644 --- a/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java +++ b/src/main/java/club/joylink/rtss/services/RunPlanDraftService.java @@ -21,7 +21,8 @@ import club.joylink.rtss.vo.client.PageVO; import club.joylink.rtss.vo.client.runplan.*; import club.joylink.rtss.vo.client.runplan.user.RunPlanRoutingVO; import club.joylink.rtss.vo.client.runplan.user.RunPlanRunlevelVO; -import club.joylink.rtss.vo.map.*; +import club.joylink.rtss.vo.map.MapVO; +import club.joylink.rtss.vo.map.RealLineConfigVO; import club.joylink.rtss.vo.map.graph.MapSectionNewVO; import club.joylink.rtss.vo.map.graph.MapStationNewVO; import club.joylink.rtss.vo.map.graph.MapStationStandNewVO; @@ -759,13 +760,12 @@ public class RunPlanDraftService implements IRunPlanDraftService { // tripVO.setIsInbound(true); tripVO.setIsReentry(false); // tripVO.setIsOutbound(false); - } else if (i == 0) { - tripVO.setIsReentry(true); -// tripVO.setIsInbound(false); } else { -// tripVO.setIsInbound(false); - tripVO.setIsReentry(true); -// tripVO.setIsOutbound(false); + if (tripVO.getIsInbound() != null && tripVO.getIsInbound()) { //入库计划 + tripVO.setIsReentry(false); + } else { //非入库计划 + tripVO.setIsReentry(true); + } } } //是否为备用车