feat：乐团改造

mec-biz/src/main/java/com/ym/mec/biz/service/CourseScheduleService.java

@@ -618,6 +618,15 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
 	void courseRepeatCheck();
 
 	/**
+	 * @describe 将被合并的课程替换为主课程
+	 * @author qnc99
+	 * @date 2020/12/7 0007
+	 * @param courseSchedules:
+	 * @return void
+	 */
+	void mergeCourseReplace(List<CourseSchedule> courseSchedules);
+
+	/**
 	 * @describe 课程合并
 	 * @author qnc99
 	 * @date 2020/11/27 0027

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

@@ -5253,6 +5253,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 	}
 
 	@Override
+	public void mergeCourseReplace(List<CourseSchedule> courseSchedules) {
+		Set<Long> newCourseIds = courseSchedules.stream().filter(c -> Objects.nonNull(c.getNewCourseId())).map(CourseSchedule::getNewCourseId).collect(Collectors.toSet());
+		if(CollectionUtils.isEmpty(newCourseIds)){
+			return;
+		}
+		List<CourseSchedule> mainCourses = courseScheduleDao.findByCourseScheduleIds(new ArrayList<>(newCourseIds));
+//		mainCourses.stream().collect()
+	}
+
+	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void courseMerge(CourseMergeDto courseMergeInfo) {
 		Date now = new Date();

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -1224,7 +1224,7 @@
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             UPDATE course_schedule
             <set>
-                <if test="item.newCourseId != null">
+                <if test="item.newCourseId != null and item.newCourseId > 0">
                     new_course_id_ = #{item.newCourseId},
                 </if>
                 <if test="item.classDate != null">