Parcourir la source

Merge branch 'zx-06-15-live' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:
	mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java
zouxuan il y a 2 ans
Parent
commit
cb098dfc89

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -2343,13 +2343,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
         List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(courseScheduleIds);
 		//校验可排课时间
 		this.checkLiveAdjust(courseSchedules);
-
-        //校验机构线上课人数上限
+		//校验机构线上课人数上限
 		this.checkOnlineCategory(courseSchedules,vipGroupCourseAdjustInfo.getTeachMode());
 		//重置连堂课标记
+		this.resetLiveRemind(courseSchedules);
 		List<CourseSchedule> liveCourseSchedules = Lists.newArrayList();
 		//拷贝历史直播课
-		BeanUtils.copyProperties(courseSchedules,liveCourseSchedules);
+		Collections.copy(liveCourseSchedules,courseSchedules);
         courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
 		//获取操作日志
 		List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseScheduleIds, courseSchedules, user.getId(), now);