新增课程合并时间

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -78,6 +78,10 @@ public class CourseSchedule  extends BaseEntity{
 	@ApiModelProperty(value = "合并课标识,0未合并，1主课，2被合并课",required = false)
 	private Integer mergeFlag = 0;
 
+	@Getter
+	@ApiModelProperty(value = "课程合并时间",required = false)
+	private Date mergeTime;
+
 	private GroupType groupType;
 
 	/**  */
@@ -243,6 +247,10 @@ public class CourseSchedule  extends BaseEntity{
 	@ApiModelProperty("直播课分享模式，默认：NO_SHARE(未分享)，OPEN（公开）,PRIVATE(私密)")
 	private ShareModeEnum shareMode;
 
+	public void setMergeTime(Date mergeTime) {
+		this.mergeTime = mergeTime;
+	}
+
 	public void setMergeFlag(Integer mergeFlag) {
 		this.mergeFlag = mergeFlag;
 	}

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

@@ -5423,6 +5423,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			}
 			courseSchedule.setNote("课程合并");
 			courseSchedule.setMergeFlag(2);
+			courseSchedule.setMergeTime(now);
 		}
 		List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseScheduleIds(allCourseIds);
 
@@ -5455,7 +5456,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseSchedules.add(courseMergeInfo);
 		List<CourseScheduleModifyLog> insertCourseScheduleModifyLogList = new ArrayList<>();
 
-		List<CourseSchedule> mergeCourses = allCourses.stream().filter(c->courseMergeInfo.getMergeCourseIds().contains(c.getId())&&!c.getId().equals(courseMergeInfo.getId())).collect(Collectors.toList());
+		List<CourseSchedule> mergeCourses = allCourses.stream()
+				.filter(c->courseMergeInfo.getMergeCourseIds().contains(c.getId())&&!c.getId().equals(courseMergeInfo.getId())).collect(Collectors.toList());
 		for (CourseSchedule courseSchedule : mergeCourses) {
 			CourseScheduleModifyLog courseScheduleModifyLog = new CourseScheduleModifyLog();
 			courseScheduleModifyLog.setCourseScheduleId(courseSchedule.getId());
@@ -5464,6 +5466,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 			//课程信息变更
 			courseSchedule.setNewCourseId(courseMergeInfo.getId());
+			courseSchedule.setMergeTime(now);
 			courseScheduleModifyLog.setCurrentCourseSchedule(JsonUtil.toJSONString(courseSchedule));
 			courseScheduleModifyLog.setOperatorId(courseMergeInfo.getOperatorId());
 			insertCourseScheduleModifyLogList.add(courseScheduleModifyLog);