课表同步程序代码调整

src/main/java/com/xjrsoft/module/job/JianyuekbScheduleTask.java

@@ -387,6 +387,7 @@ public class JianyuekbScheduleTask {
                         .in(!courseAdjustIds.isEmpty(), WfCourseAdjust::getId, courseAdjustIds)
                         .and(wq -> wq.between(WfCourseAdjust::getAdjustDate, startDate, endDate).or().between(WfCourseAdjust::getExchangeDate, startDate, endDate))
                         .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
+                        .eq(WfCourseAdjust::getEnabledMark, EnabledMark.ENABLED.getCode())
         );
         List<WfCourseAdjust> cancelList = new ArrayList<>();//需要作废的申请
 

src/test/java/com/xjrsoft/module/job/JianyuekbScheduleTaskTest.java

@@ -386,6 +386,7 @@ class JianyuekbScheduleTaskTest {
                         .in(!courseAdjustIds.isEmpty(), WfCourseAdjust::getId, courseAdjustIds)
                         .and(wq -> wq.between(WfCourseAdjust::getAdjustDate, startDate, endDate).or().between(WfCourseAdjust::getExchangeDate, startDate, endDate))
                         .eq(WorkflowFormRelation::getCurrentState, HistoricProcessInstance.STATE_COMPLETED)
+                        .eq(WfCourseAdjust::getEnabledMark, EnabledMark.ENABLED.getCode())
         );
         List<WfCourseAdjust> cancelList = new ArrayList<>();//需要作废的申请