update

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

@@ -358,20 +358,10 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		if(CollectionUtils.isEmpty(courseSchedules)){
 			return;
 		}
-		//第一节课
-		CourseSchedule firstCourseSchedule;
-		//最后一节课
-		CourseSchedule latestCourseSchedule;
-		if(courseSchedules.size()==1){
-			firstCourseSchedule = courseSchedules.get(0);
-			latestCourseSchedule = courseSchedules.get(0);
-		}else{
-			firstCourseSchedule = courseSchedules.stream().min(Comparator.comparing(CourseSchedule::getStartClassTime)).get();
-			latestCourseSchedule = courseSchedules.stream().max(Comparator.comparing(CourseSchedule::getEndClassTime)).get();
-		}
-		//获取第一节课和最后一节课所包含的时间段内已存在的课程
-		List<CourseSchedule> existCourseSchedules = courseScheduleDao
-				.findAllCourseByDateZone(firstCourseSchedule.getStartClassTime(), latestCourseSchedule.getEndClassTime());
+		List<String> classDates = courseSchedules.stream().map(courseSchedule -> DateUtil.dateToString(courseSchedule.getClassDate(), "yyyy-MM-dd"))
+				.collect(Collectors.toList());
+
+		List<CourseSchedule> existCourseSchedules = courseScheduleDao.findByClassDate(classDates);
 
 		//只需要调整课程信息的课程编号列表
 		List<Long> updateCourseScheduleIds = courseSchedules

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

@@ -1267,33 +1267,18 @@
     <select id="findByClassDate" resultMap="CourseSchedule">
       SELECT
             cs.id_,
-            cs.music_group_id_,
-            cs.group_type_,
             cs.class_group_id_,
-            cs.status_,
-            cs.subsidy_,
-            cs.class_date_,
             CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
             CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-            cs.teacher_id_,
-            cs.actual_teacher_id_,
-            cs.create_time_,
-            cs.update_time_,
-            cs.teach_mode_,
-            cs.type_,
-            cs.name_,
-            cs.student_num_,
-            cs.leave_student_num_,
-            cs.schoole_id_,
-            cg.type_ class_group_type_
+            cs.actual_teacher_id_
         FROM
-            course_schedule cs left join class_group cg on cs.class_group_id_ = cg.id_
+            course_schedule cs
         WHERE (cs.class_date_ IN
               <foreach collection="classDates" item="classDate" open="(" close=")" separator=",">
                   #{classDate}
               </foreach>
               )
-            AND (cs.del_flag_ IS NULL OR cs.del_flag_=0) AND (cg.del_flag_ IS NULL OR cg.del_flag_=0)
+            AND (cs.del_flag_ IS NULL OR cs.del_flag_=0)
     </select>