课表同步程序调整

1、同步时，删除日期内所有课表数据
2、作废日期内的调课和顶课数据

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

@@ -90,10 +90,11 @@ public class JianyuekbScheduleTask {
             if(today.isAfter(startDateObj)){
                 startDateStr = today.format(formatter);
             }
-            //删除课表信息
+            //删除课表信息;
+            String classIds = gradeClassMaps.get(eduYearSerialNo).toString().replace("[", "").replace("]", "");
             String delSql = "delete from course_table where schedule_date between '" + startDateStr + "'" +
-                    " and '" + endDateStr + "' and adjust_type is null" +
-                    " and class_id in (" + gradeClassMaps.get(eduYearSerialNo).toString().replace("[","").replace("]","")+ ")";
+                    " and '" + endDateStr +
+                    " and class_id in (" + classIds + ")";
             SqlRunnerAdapter.db().delete(delSql);
 
             long between = ChronoUnit.DAYS.between(startDateObj, endDateObj);
@@ -115,6 +116,10 @@ public class JianyuekbScheduleTask {
 
             updSql = "update course_receive_msg set is_callback = 1 where id = " + receiveMsg.get("id").toString();
             SqlRunnerAdapter.db().update(updSql);
+            //作废调课和顶课
+            updSql = "UPDATE wf_course_adjust SET enabled_mark = 0 WHERE adjust_type BETWEEN '" + startDateStr + "'" +
+                    " and '" + endDateStr + " and class_id in (" + classIds + ")";
+            SqlRunnerAdapter.db().update(updSql);
         }
         doExecute(allScheduleInfo);
     }