|
|
@@ -47,6 +47,7 @@ import org.apache.commons.collections.CollectionUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections.ListUtils;
|
|
|
import org.apache.commons.collections.MapUtils;
|
|
|
+import org.apache.commons.lang3.SerializationUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.jetbrains.annotations.Nullable;
|
|
|
import org.joda.time.DateTime;
|
|
|
@@ -2347,7 +2348,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
this.checkOnlineCategory(courseSchedules,vipGroupCourseAdjustInfo.getTeachMode());
|
|
|
courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
|
|
|
//拷贝历史直播课
|
|
|
- List<CourseSchedule> liveCourseSchedules = Lists.newArrayList(courseSchedules);
|
|
|
+ List<CourseSchedule> liveCourseSchedules = JSON.parseArray(JSON.toJSONString(courseSchedules),CourseSchedule.class);
|
|
|
//获取操作日志
|
|
|
List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseScheduleIds, courseSchedules, user.getId(), now);
|
|
|
|
|
|
@@ -3042,7 +3043,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
Map<Long, CourseSchedule> oldCourseScheduleMap = oldCourseScheduleList.stream().collect(Collectors.toMap(CourseSchedule::getId, c -> c));
|
|
|
|
|
|
- List<CourseSchedule> liveCourseSchedules = Lists.newArrayList(oldCourseScheduleList);
|
|
|
+ List<CourseSchedule> liveCourseSchedules = JSON.parseArray(JSON.toJSONString(oldCourseScheduleList),CourseSchedule.class);
|
|
|
for(CourseSchedule newCourseSchedule : newCourseSchedules){
|
|
|
|
|
|
//获取数据库中的记录
|
zouxuan