Browse Source

fix:临时班课程冲突检测调整为正常冲突检测逻辑

Joburgess 4 years ago
parent
commit
16a02309ce

+ 2 - 6
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -2041,11 +2041,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         //排课处理
-        if (classGroup.getType().equals(ClassGroupTypeEnum.SNAP)) {
-            courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
-        } else {
-            courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
-        }
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
 
         //老师结算表
         if (courseScheduleTeacherSalaryList.size() > 0) {
@@ -2334,7 +2330,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
             now = now.plusDays(1);
         }
-        courseScheduleService.checkSnapCourseShchedules(courseScheduleList);
+        courseScheduleService.checkNewCourseSchedules(courseScheduleList,false);
 
         //老师结算表
         if (courseScheduleTeacherSalaryList.size() > 0) {