Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -1014,11 +1014,15 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
     }
 
     private String courseCheckInfo(CourseSchedule preCourseSchedule, CourseSchedule backCourseSchedule, List<Long> existCourseScheduleIds, Integer type) {
+        List<CourseSchedule> courseSchedules=new ArrayList<>();
+        courseSchedules.add(preCourseSchedule);
+        courseSchedules.add(backCourseSchedule);
+        courseSchedules.sort(Comparator.comparing(CourseSchedule::getStartClassTime));
         //提示信息
         StringBuffer errInfo = new StringBuffer("在");
-        errInfo.append(DateUtil.dateToString(preCourseSchedule.getStartClassTime(), "yyyy-MM-dd HH:mm"));
+        errInfo.append(DateUtil.dateToString(courseSchedules.get(1).getStartClassTime(), "yyyy-MM-dd HH:mm"));
         errInfo.append("至");
-        errInfo.append(DateUtil.dateToString(backCourseSchedule.getEndClassTime(), "yyyy-MM-dd HH:mm"));
+        errInfo.append(DateUtil.dateToString(courseSchedules.get(0).getEndClassTime(), "yyyy-MM-dd HH:mm"));
         errInfo.append("的时间段内");
         errInfo.append("安排的课程存在冲突,");
         errInfo.append("冲突课程为：");
@@ -1050,7 +1054,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                 if (Objects.nonNull(practiceGroup)) {
                     groupName = practiceGroup.getName();
                 }
-            }else {
+            }else{
                 MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
                 if (Objects.nonNull(musicGroup)) {
                     groupName = musicGroup.getName();