|
@@ -2349,7 +2349,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
this.resetLiveRemind(courseSchedules);
|
|
this.resetLiveRemind(courseSchedules);
|
|
|
List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
|
|
List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
|
|
|
//拷贝历史直播课
|
|
//拷贝历史直播课
|
|
|
- BeanUtils.copyProperties(courseSchedules,liveCourseSchedules);
|
|
|
|
|
|
|
+ Collections.copy(liveCourseSchedules,courseSchedules);
|
|
|
courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
//获取操作日志
|
|
//获取操作日志
|
|
|
List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseScheduleIds, courseSchedules, user.getId(), now);
|
|
List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseScheduleIds, courseSchedules, user.getId(), now);
|
|
@@ -3048,7 +3048,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Map<Long, CourseSchedule> oldCourseScheduleMap = oldCourseScheduleList.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
Map<Long, CourseSchedule> oldCourseScheduleMap = oldCourseScheduleList.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
|
|
|
|
|
|
List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
|
|
List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
|
|
|
- BeanUtils.copyProperties(oldCourseScheduleList,liveCourseSchedules);
|
|
|
|
|
|
|
+ Collections.copy(liveCourseSchedules,oldCourseScheduleList);
|
|
|
for(CourseSchedule newCourseSchedule : newCourseSchedules){
|
|
for(CourseSchedule newCourseSchedule : newCourseSchedules){
|
|
|
|
|
|
|
|
//获取数据库中的记录
|
|
//获取数据库中的记录
|
zouxuan