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

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

@@ -708,32 +708,42 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		errInfo.append("的时间段内");
 		errInfo.append("安排的课程存在冲突,");
 		errInfo.append("冲突课程为：");
+
+		String groupId="";
+		CourseSchedule.CourseScheduleType courseType=CourseSchedule.CourseScheduleType.VIP;
+		CourseSchedule courseSchedule=new CourseSchedule();
 		if(Objects.nonNull(preCourseSchedule.getId())&&existCourseScheduleIds.contains(preCourseSchedule.getId())){
-			MusicGroup musicGroup = musicGroupDao.get(preCourseSchedule.getMusicGroupId());
-			if(Objects.nonNull(musicGroup)){
-				errInfo.append(musicGroup.getName());
-				errInfo.append("(");
-				errInfo.append(musicGroup.getId());
-				errInfo.append(")-");
-			}
-			errInfo.append(preCourseSchedule.getName());
-			errInfo.append("(");
-			errInfo.append(preCourseSchedule.getId());
-			errInfo.append(")");
+			groupId=preCourseSchedule.getMusicGroupId();
+			courseType=preCourseSchedule.getType();
+            courseSchedule=preCourseSchedule;
 		}
 		if(Objects.nonNull(backCourseSchedule.getId())&&existCourseScheduleIds.contains(backCourseSchedule.getId())){
-			MusicGroup musicGroup = musicGroupDao.get(backCourseSchedule.getMusicGroupId());
+			groupId=backCourseSchedule.getMusicGroupId();
+			courseType=preCourseSchedule.getType();
+			courseSchedule=backCourseSchedule;
+		}
+
+		String groupName="";
+		if(courseType.equals(CourseSchedule.CourseScheduleType.VIP)){
+			VipGroup vipGroup=vipGroupDao.get(Long.valueOf(groupId));
+			if(Objects.nonNull(vipGroup)){
+				groupName=vipGroup.getName();
+			}
+		}else{
+			MusicGroup musicGroup = musicGroupDao.get(groupId);
 			if(Objects.nonNull(musicGroup)){
-				errInfo.append(musicGroup.getName());
-				errInfo.append("(");
-				errInfo.append(musicGroup.getId());
-				errInfo.append(")-");
+				groupName=musicGroup.getName();
 			}
-			errInfo.append(backCourseSchedule.getName());
-			errInfo.append("(");
-			errInfo.append(backCourseSchedule.getId());
-			errInfo.append("),");
 		}
+
+		errInfo.append(groupName);
+		errInfo.append("(");
+		errInfo.append(groupId);
+		errInfo.append(")-");
+		errInfo.append(courseSchedule.getName());
+		errInfo.append("(");
+		errInfo.append(courseSchedule.getId());
+		errInfo.append(")");
 		errInfo.append("类型为：");
 		switch (type){
 			case 1:

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

@@ -1267,9 +1267,12 @@
     <select id="findByClassDate" resultMap="CourseSchedule">
       SELECT
             cs.id_,
+            cs.music_group_id_,
             cs.class_group_id_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.type_,
+            cs.name_,
             cs.actual_teacher_id_
         FROM
             course_schedule cs