课表同步调整

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

@@ -178,6 +178,7 @@ public class JianyuekbScheduleTask {
         Map<String, Map<String, String>> dataMap = initDataMap();
         for (Map<String, Object> receiveMsg : receiveMsgs) {
             String eduYearSerialNo = receiveMsg.get("edu_year_serial_no").toString();
+            Long courseReceiveMsgId = Long.parseLong(receiveMsg.get("id").toString());
             if(ongoing.contains(eduYearSerialNo)){
                 continue;
             }
@@ -231,7 +232,7 @@ public class JianyuekbScheduleTask {
 
                 ongoing.remove(eduYearSerialNo);
                 redisUtil.set(taskKey, ongoing);
-                insertCourse(allScheduleInfo, dataMap, dataUtil);
+                insertCourse(allScheduleInfo, dataMap, dataUtil, courseReceiveMsgId);
                 //恢复挂起的流程
                 restoreCourseAdjust(processIds);
                 //处理该日期内已经审批通过的调课和顶课申请
@@ -245,7 +246,7 @@ public class JianyuekbScheduleTask {
         }
     }
 
-    void insertCourse(JsonArray scheduleInfo, Map<String, Map<String, String>> dataMap, DataUtil dataUtil){
+    void insertCourse(JsonArray scheduleInfo, Map<String, Map<String, String>> dataMap, DataUtil dataUtil, Long courseReceiveMsgId){
         //获取年级
         String tableName = "base_grade";
 //            Map<String, Long> gradeMap = dataMap.get(tableName);
@@ -265,7 +266,7 @@ public class JianyuekbScheduleTask {
         tableName = "base_classroom";
         Map<String, String> classroomMap = dataMap.get(tableName);
 
-        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap);
+        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap, courseReceiveMsgId);
         dataUtil.insertClassTime(scheduleInfo);
     }
 

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

@@ -3,7 +3,6 @@ package com.xjrsoft.module.schedule.util;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.Entity;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -16,8 +15,6 @@ import com.xjrsoft.module.base.entity.BaseGrade;
 import com.xjrsoft.module.base.entity.BaseLabel;
 import com.xjrsoft.module.base.entity.BaseSemester;
 import com.xjrsoft.module.organization.entity.Department;
-import com.xjrsoft.module.schedule.entity.WfCourseAdjust;
-import com.xjrsoft.module.schedule.service.IWfCourseAdjustService;
 import com.xjrsoft.module.schedule.vo.StudentJianyuekbVo;
 import com.xjrsoft.module.teacher.entity.XjrUser;
 import lombok.extern.slf4j.Slf4j;
@@ -622,7 +619,8 @@ public class DataUtil {
     }
 
     public void insertCourseTableEntiy(JsonArray data, Map<String, String> classroomMap, Map<String, String> coureseMap,
-                                  Map<String, String> semesterMap, Map<String, String> teacherMap, Map<String, String> classMap) {
+                                  Map<String, String> semesterMap, Map<String, String> teacherMap, Map<String, String> classMap
+            , Long courseReceiveMsgId) {
 
         String sql = "SELECT CONCAT(schedule_date,class_id,time_number) AS only_key,id FROM course_table";
         List<Map<String, Object>> oldDataList = SqlRunnerAdapter.db().selectList(sql);
@@ -715,6 +713,7 @@ public class DataUtil {
             entity.set("schedule_date", scheduleDate);
             entity.set("jianyue_id", asJsonObject.get("id").getAsString());
             entity.set("key_info", keyInfo);
+            entity.set("course_receive_msg_id", courseReceiveMsgId);
             entityList.add(entity);
         }
         if(!entityList.isEmpty()){

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

@@ -167,7 +167,7 @@ class JianyuekbScheduleTaskTest {
         tableName = "base_classroom";
         Map<String, String> classroomMap = dataMap.get(tableName);
 
-        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap);
+        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap, null);
         dataUtil.insertClassTime(scheduleInfo);
     }
 

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

@@ -266,7 +266,7 @@ class JianyuekbScheduleTaskTest2 {
         tableName = "base_classroom";
         Map<String, String> classroomMap = dataMap.get(tableName);
 
-        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap);
+        dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap, teacherMap, classMap, null);
         dataUtil.insertClassTime(scheduleInfo);
     }