aps-调度重排

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -3992,7 +3992,10 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
             List<ApsProcessOperationProcessEquDo> list = this.baseMapper.selectNeedRescheduleEqu(needScheduleDate);
             //查询重排时间之后的所有作业明细
             String finalNeedScheduleDate = needScheduleDate;
-            List<ApsProcessOperationProcessEquDo> needScheduleList = list.stream().filter(item -> item.getPlanstartdate().compareTo(DateUtil.parseDate(finalNeedScheduleDate)) >= 0).collect(Collectors.toList());
+            List<ApsProcessOperationProcessEquDo> needScheduleList = list.stream().filter(item ->
+                    item.getPlanstartdate().compareTo(DateUtil.parseDate(finalNeedScheduleDate)) >= 0
+                    && item.getPlanstartdate().compareTo(DateUtil.offsetDay(DateUtil.parseDate(finalNeedScheduleDate),1)) <= 0
+            ).collect(Collectors.toList());
             //查询重排时间前一天的所有作业明细
             List<ApsProcessOperationProcessEquDo> beforeScheduleList = list.stream().filter(item -> item.getPlanstartdate().compareTo(DateUtil.parseDate(finalNeedScheduleDate)) < 0).collect(Collectors.toList());
             //重排时间前一天的所有作业明细ID