|
@@ -1876,6 +1876,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if (CollectionUtils.isEmpty(courseSchedules)) {
|
|
|
return false;
|
|
|
}
|
|
|
+ //直播课不校验冲突
|
|
|
+ if(courseSchedules.get(0).getGroupType() == LIVE){
|
|
|
+ return true;
|
|
|
+ }
|
|
|
List<String> classDates = courseSchedules.stream().map(courseSchedule -> DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy-MM-dd"))
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
@@ -3516,7 +3520,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
}
|
|
|
|
|
|
if(newCourseSchedules.size() > 0){
|
|
|
- courseScheduleDao.batchUpdate(newCourseSchedules);
|
|
|
+ for (CourseSchedule course : newCourseSchedules) {
|
|
|
+ course.setLiveRemind(0);
|
|
|
+ }
|
|
|
+ courseScheduleDao.batchUpdate(newCourseSchedules);
|
|
|
List<Integer> classGroupIds = newCourseSchedules.stream().filter(courseSchedule -> Objects.nonNull(courseSchedule.getClassGroupId())).map(CourseSchedule::getClassGroupId).collect(Collectors.toList());
|
|
|
if(!CollectionUtils.isEmpty(classGroupIds)){
|
|
|
classGroupService.updateClassGroupsCourseInfo(classGroupIds);
|
|
@@ -6477,7 +6484,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
CourseSchedule next = beforeCourse.get(i + 1);
|
|
|
|
|
|
if (!next.getContinuousCourse()) {
|
|
|
- newCourseSchedules.add(next);
|
|
|
+ //newCourseSchedules.add(next);
|
|
|
break;
|
|
|
}
|
|
|
}
|