|
@@ -5250,6 +5250,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
allCourseIds.add(courseMergeInfo.getId());
|
|
|
allCourseIds.addAll(courseMergeInfo.getMergeCourseIds());
|
|
|
List<CourseSchedule> allCourses = courseScheduleDao.findByCourseScheduleIds(allCourseIds);
|
|
|
+ int courseTypeNum = allCourses.stream().map(CourseSchedule::getType).collect(Collectors.toSet()).size();
|
|
|
+ if(courseTypeNum>1){
|
|
|
+ throw new BizException("课程合并仅支持同课程类型");
|
|
|
+ }
|
|
|
Date now = new Date();
|
|
|
for (CourseSchedule courseSchedule : allCourses) {
|
|
|
if(Objects.nonNull(courseSchedule.getNewCourseId())){
|
|
@@ -5296,6 +5300,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
courseSchedule.setStartClassTime(courseMergeInfo.getStartClassTime());
|
|
|
courseSchedule.setEndClassTime(courseMergeInfo.getEndClassTime());
|
|
|
courseSchedule.setActualTeacherId(courseMergeInfo.getActualTeacherId());
|
|
|
+ courseSchedule.setClassGroupId(courseMergeInfo.getClassGroupId());
|
|
|
courseSchedule.setSchoolId(courseMergeInfo.getSchoolId());
|
|
|
|
|
|
courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
|
|
@@ -5305,6 +5310,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
courseScheduleDao.batchUpdate(mergeCourses);
|
|
|
for (CourseScheduleStudentPayment courseScheduleStudentPayment : courseScheduleStudentPayments) {
|
|
|
courseScheduleStudentPayment.setCourseScheduleId(courseMergeInfo.getId());
|
|
|
+ courseScheduleStudentPayment.setClassGroupId(courseMergeInfo.getClassGroupId());
|
|
|
}
|
|
|
courseScheduleStudentPaymentDao.batchUpdate(courseScheduleStudentPayments);
|
|
|
|