update

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

@@ -769,11 +769,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 							throw new BizException("调整时间不得早于开课时间（{}）",groupStartDate);
 						}
 					}
-					if (groupEndDate != null) {
+					/*if (groupEndDate != null) {
 						if (calendar.getTime().after(groupEndDate)) {
 							throw new BizException("排课时间超出排课截止日期（{}）", DateUtil.dateToString(groupEndDate, DateUtil.DATE_FORMAT_MIN));
 						}
-					}
+					}*/
 
 					courseScheduleDao.insert(courseSchedule);
 					courseScheduleList.add(courseSchedule);
@@ -1683,6 +1683,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			existCours.setUpdateTime(now);
 			existCours.setStartClassTime(ac.getStartClassTime());
 			existCours.setEndClassTime(DateUtil.addMinutes(existCours.getStartClassTime(), singleClassMinutes));
+            
+            //课程结束时间必须在21：00之前
+            if(DateUtil.getHour(existCours.getEndClassTime()) > 20 && DateUtil.getMinute(existCours.getEndClassTime()) > 0){
+            	throw new BizException("课程结束时间不能超过21:00，请重新调整上课时间");
+            }
 
 			if(!DateUtil.isSameDay(existCours.getStartClassTime(), existCours.getEndClassTime())){
 				throw new BizException("课程暂不支持跨天");
@@ -3353,6 +3358,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             	int minutes = DateUtil.minutesBetween(oldCourseSchedule.getStartClassTime(), oldCourseSchedule.getEndClassTime());
             	newCourseSchedule.setEndClassTime(DateUtil.addMinutes(newCourseSchedule.getStartClassTime(), minutes));
             }
+            
+            //课程结束时间必须在21：00之前
+            if(DateUtil.getHour(newCourseSchedule.getEndClassTime()) > 20 && DateUtil.getMinute(newCourseSchedule.getEndClassTime()) > 0){
+            	throw new BizException("课程结束时间不能超过21:00，请重新调整上课时间");
+            }
+            
             //判断上课时间是否跨天
 			if (!DateUtil.isSameDay(newCourseSchedule.getStartClassTime(), newCourseSchedule.getEndClassTime())) {
 				throw new BizException("上课时间不允许跨天，请重新调整上课时间");

mec-util/src/main/java/com/ym/mec/util/date/DateUtil.java

@@ -332,7 +332,7 @@ public class DateUtil {
 		return calendar.get(Calendar.HOUR_OF_DAY);
 	}
 
-	public static int geMinute(Date date) {
+	public static int getMinute(Date date) {
 		if (date == null) {
 			return -1;
 		}