Browse Source

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

Joburgess 4 years ago
parent
commit
113d8371b6

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

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