|
@@ -301,6 +301,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ List<CourseSchedule> courseScheduleList = new ArrayList<>();
|
|
|
Integer schoolId = musicGroup.getSchoolId();
|
|
|
for (HighClassGroupDto highClassGroup : highClassGroupList) {
|
|
|
if (highClassGroup.getDayOfWeek() < 1 || highClassGroup.getDayOfWeek() > 7) {
|
|
@@ -330,7 +331,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
classGroupTeacherMapperService.insert(classGroupTeacherMapper);
|
|
|
|
|
|
//3、插入班级排课信息
|
|
|
- List<CourseSchedule> courseScheduleList = new ArrayList<>();
|
|
|
int times = 0;
|
|
|
//LocalDateTime now = LocalDateTime.ofInstant(highClassGroup.getStartDate().toInstant(), ZoneId.systemDefault());
|
|
|
LocalDateTime now = LocalDate.parse(highClassGroup.getStartDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd")).atStartOfDay();
|
|
@@ -369,17 +369,17 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
|
|
|
}
|
|
|
now = now.plusDays(1);
|
|
|
}
|
|
|
- //检测新排课冲突
|
|
|
- courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
|
|
|
- courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
|
|
|
|
|
|
List<Integer> userIdList = new ArrayList<>();
|
|
|
userIdList.add(classGroupTeacherMapper.getUserId());
|
|
|
|
|
|
//加入Im群组
|
|
|
addImGroup(highClassGroup, userIdList);
|
|
|
-
|
|
|
}
|
|
|
+ //检测新排课冲突
|
|
|
+ courseScheduleService.checkNewCourseSchedules(courseScheduleList, false);
|
|
|
+ courseScheduleDao.batchAddCourseSchedules(courseScheduleList);
|
|
|
+
|
|
|
redisCache.releaseLocked(key, value);
|
|
|
return highClassGroupList;
|
|
|
}
|