|
|
@@ -547,6 +547,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
List<CourseSchedule> existCourseSchedules = courseScheduleDao
|
|
|
.findAllCourseByDateZone(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
|
|
|
|
|
|
+ if(existCourseSchedules ==null || existCourseSchedules.size()==0){
|
|
|
+ return null;
|
|
|
+ }
|
|
|
//只需要调整课程信息的课程编号列表
|
|
|
List<Long> updateCourseScheduleIds = courseSchedules
|
|
|
.stream()
|
|
|
@@ -621,7 +624,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
boolean isTeacherRepeat = false;
|
|
|
boolean isStudentRepeat = false;
|
|
|
//检测老师冲突
|
|
|
- existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId()).getIds());
|
|
|
+ existCourseSchedule.setTeachingTeacherIdList(courseScheduleTeacherMap.get(existCourseSchedule.getId().intValue()).getIds());
|
|
|
newCourseSchedule.setTeachingTeacherIdList(classGroupTeachingTeacherMap.get(newCourseSchedule.getClassGroupId()).getIds());
|
|
|
|
|
|
if(!CollectionUtils.isEmpty(newCourseSchedule.getTeachingTeacherIdList())
|
zouxuan