课表同步调整

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

@@ -420,10 +420,13 @@ public class JianyuekbScheduleTask {
                 courseCount += exchangeCourseIds.length;
             }
             //查询顶课老师在本条申请的课程中的节次是否包含课
-            Integer substituteTeacherCourseCount = courseTableService.getSubstituteTeacherCourseCountByParams(new ClassTeacherDto() {{
-                setWfCourseAdjustId(courseAdjust.getId());
-                setTeacherId(Long.parseLong(courseAdjust.getExchangeTeacherId()));
-            }});
+            Integer substituteTeacherCourseCount = 0;
+            if(CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())){
+                substituteTeacherCourseCount = courseTableService.getSubstituteTeacherCourseCountByParams(new ClassTeacherDto() {{
+                    setWfCourseAdjustId(courseAdjust.getId());
+                    setTeacherId(Long.parseLong(courseAdjust.getExchangeTeacherId()));
+                }});
+            }
             if (courseList.size() != courseCount || substituteTeacherCourseCount > 0) {
                 //表明课程变化了，需要重新申请，需要将原来的申请作废并进行微信消息通知
                 courseAdjust.setEnabledMark(EnabledMark.DISABLED.getCode());

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

@@ -151,9 +151,9 @@ class JianyuekbScheduleTaskTest {
     }
     public void doExecute() {
         String active = SpringUtil.getActiveProfile();
-        if(!"prod".equals(active)){
-            return;
-        }
+//        if(!"prod".equals(active)){
+//            return;
+//        }
         String sql = "SELECT * FROM course_receive_msg WHERE delete_mark = 0 AND is_callback = -1";
         List<Map<String, Object>> receiveMsgs = SqlRunnerAdapter.db().selectList(sql);
         if(receiveMsgs.isEmpty()){
@@ -212,9 +212,9 @@ class JianyuekbScheduleTaskTest {
                 LocalDate startDateObj = LocalDate.parse(startDateStr);
                 String endDateStr = receiveMsg.get("end_date").toString();
                 LocalDate endDateObj = LocalDate.parse(endDateStr);
-                if(today.isAfter(startDateObj)){
-                    startDateStr = today.format(formatter);
-                }
+//                if(today.isAfter(startDateObj)){
+//                    startDateStr = today.format(formatter);
+//                }
 
                 //删除课表信息;
                 List<BaseClass> classList = gradeClassMaps.get(eduYearSerialNo);
@@ -286,7 +286,7 @@ class JianyuekbScheduleTaskTest {
 
         Set<String> techerIds = dataUtil.insertCourseTableEntiy(scheduleInfo, classroomMap, courseMap, semesterMap,
                 teacherMap, classMap, String.valueOf(courseReceiveMsgId), startDate, endDate);
-        sendMsg(techerIds, courseReceiveMsgId);
+        //sendMsg(techerIds, courseReceiveMsgId);
         dataUtil.insertClassTime(scheduleInfo);
     }
 
@@ -419,10 +419,14 @@ class JianyuekbScheduleTaskTest {
                 courseCount += exchangeCourseIds.length;
             }
             //查询顶课老师在本条申请的课程中的节次是否包含课
-            Integer substituteTeacherCourseCount = courseTableService.getSubstituteTeacherCourseCountByParams(new ClassTeacherDto() {{
-                setWfCourseAdjustId(courseAdjust.getId());
-                setTeacherId(Long.parseLong(courseAdjust.getExchangeTeacherId()));
-            }});
+            Integer substituteTeacherCourseCount = 0;
+            if(CourseAdjustTypeEnum.courseSubstitute.getCode().equals(courseAdjust.getAdjustType())){
+                substituteTeacherCourseCount = courseTableService.getSubstituteTeacherCourseCountByParams(new ClassTeacherDto() {{
+                    setWfCourseAdjustId(courseAdjust.getId());
+                    setTeacherId(Long.parseLong(courseAdjust.getExchangeTeacherId()));
+                }});
+            }
+
             if(courseList.size() != courseCount || substituteTeacherCourseCount > 0){
                 //表明课程变化了，需要重新申请，需要将原来的申请作废并进行微信消息通知
                 courseAdjust.setEnabledMark(EnabledMark.DISABLED.getCode());