系统收费乐团课程，不允许跨学期调整

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

@@ -182,6 +182,17 @@ public class CourseSchedule {
 	//是否是预排课
 	private Integer preCourseFlag = 0;
 
+	//课程调整不的超过该时间限制
+	private Date validEndTime;
+
+	public Date getValidEndTime() {
+		return validEndTime;
+	}
+
+	public void setValidEndTime(Date validEndTime) {
+		this.validEndTime = validEndTime;
+	}
+
 	public Integer getPreCourseFlag() {
 		return preCourseFlag;
 	}

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

@@ -2908,13 +2908,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                         continue;
                     }
 
-                    //课时长度
-//                    long classCourseDuration = Duration.between(LocalDateTime.parse(DateUtil.dateToString(courseTimeDto.getStartDate(), "yyyy-MM-dd") + " " + courseTimeDto.getStartClassTime() + ":00", formatter),
-//                            LocalDateTime.parse(DateUtil.dateToString(courseTimeDto.getStartDate(), "yyyy-MM-dd") + " " + courseTimeDto.getEndClassTime() + ":00", formatter))
-//                            .toMinutes();
-//
-//                    totalCourseDuration += classCourseDuration;
-
                     courseTimeDto.setCourseNum(courseTimeDto.getCourseNum() + 1);
                     generateCourseTimes += 1;
 
@@ -2956,6 +2949,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseSchedule.setClassGroupType(classGroup.getType().getCode());
                     courseSchedule.setIsLock(1);
                     courseSchedule.setPreCourseFlag(1);
+                    courseSchedule.setValidEndTime(schoolTermCourseDetail.getEndSchoolTerm());
                     courseScheduleDao.insert(courseSchedule);
                     courseScheduleList.add(courseSchedule);
 
@@ -3015,13 +3009,9 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
 
         if (!CollectionUtils.isEmpty(studentList)) {
-//            studentDao.updateStudentServiceTag(null, studentIds, YesOrNoEnum.YES.getCode());
             //学生结算表
             courseScheduleStudentPaymentService.createForMemberMusicGroup(musicGroupId, courseScheduleList, studentIds);
         }
-        /*if (musicGroup.getStatus() == PROGRESS) {
-            imUserFriendService.refreshClassImUserFriend(classGroupId);
-        }*/
         return BaseController.succeed(classGroup);
     }
 

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

@@ -1904,6 +1904,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 existClassDateCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
                 newClassDateCourses.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
                 for (CourseSchedule preCourseSchedule : newClassDateCourses) {
+                	//调整后的课程截止日期不能超过学期时间
+					if(preCourseSchedule.getValidEndTime() != null){
+						if(preCourseSchedule.getValidEndTime().compareTo(preCourseSchedule.getClassDate()) < 0){
+							throw new BizException("操作失败：不允许跨学期调整");
+						}
+					}
                     for (CourseSchedule backCourseSchedule : existClassDateCourses) {
 
                         //判断前后两节课是否存在冲突