课表调整

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

@@ -45,6 +45,9 @@ public class JianyuekbScheduleTask {
         }
         String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback IS NULL";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql);
+        if(receiveMsgs.isEmpty()){
+            return;
+        }
         JsonArray allScheduleInfo = new JsonArray();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DataUtil dataUtil = new DataUtil();

src/main/java/com/xjrsoft/module/schedule/util/DataUtil.java

@@ -657,6 +657,9 @@ public class DataUtil {
             List<String> teacherIds = new ArrayList<>();
             List<String> teacherNames = new ArrayList<>();
             List<String> teacher_serial_nos = new ArrayList<>();
+            if(courseClassName.contains("声乐/舞蹈")){
+               System.out.println(teachers.toString());
+            }
             for (JsonElement teacher : teachers) {
                 JsonObject teacherJson = teacher.getAsJsonObject();
                 teacherIds.add(teacherMap.get(teacherJson.get("teacherSerialNo").getAsString())==null?"0":teacherMap.get(teacherJson.get("teacherSerialNo").getAsString()));
@@ -678,8 +681,8 @@ public class DataUtil {
             String onlyKey = scheduleDate + classId + timeNumber;
             if(oldDataMap.get(onlyKey) != null){
                 String updSql = "update course_table set teacher_serial_no = '" + teacher_serial_no + "'" +
-                        ", teacher_id = " + teacherId
-                        + ", teacher_name = '" + teacherName + "', modify_date = now()" +
+                        ", teacher_id = '" + teacherId
+                        + "', teacher_name = '" + teacherName + "', modify_date = now()" +
                         " ,course_id = " + courseClassId + ", course_name = '" + courseClassName + "'" +
                         " where schedule_date = '" + scheduleDate + "'and class_id = " + classId + " and time_number = " + timeNumber + ";";
                 updateSqlList.add(updSql);

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

@@ -49,6 +49,9 @@ class JianyuekbScheduleTaskTest {
         String active = SpringUtil.getActiveProfile();
         String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback IS NULL";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql, CourseReceiveMsg.class);
+        if(receiveMsgs.isEmpty()){
+            return;
+        }
         JsonArray allScheduleInfo = new JsonArray();
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DataUtil dataUtil = new DataUtil();
@@ -105,7 +108,7 @@ class JianyuekbScheduleTaskTest {
             updSql = "update course_receive_msg set is_callback = 1 where id = " + receiveMsg.get("id").toString();
             SqlRunnerAdapter.db().update(updSql);
         }
-//        doExecute(allScheduleInfo);
+        doExecute(allScheduleInfo);
     }
 
     void doExecute(JsonArray scheduleInfo){