update

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseRepeatCheckDto.java

@@ -17,6 +17,8 @@ public class CourseRepeatCheckDto {
 
     private java.util.Date endClassTime;
 
+    private String organName;
+
     private List<Integer> teacherIds;
 
     private List<Integer> studentIds;
@@ -53,6 +55,14 @@ public class CourseRepeatCheckDto {
         this.endClassTime = endClassTime;
     }
 
+    public String getOrganName() {
+        return organName;
+    }
+
+    public void setOrganName(String organName) {
+        this.organName = organName;
+    }
+
     public List<Integer> getTeacherIds() {
         return teacherIds;
     }

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

@@ -5174,7 +5174,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		for (CourseRepeatCheckDto cs1 : courseRepeatCheckInfos) {
 			if(!courseRepeatIdMap.containsKey(cs1.getCourseId())){
 				courseRepeatIdMap.put(cs1.getCourseId(), new ArrayList<>());
-				courseRepeatIdMap.get(cs1.getCourseId()).add(cs1.getCourseId());
+//				courseRepeatIdMap.get(cs1.getCourseId()).add(cs1.getCourseId());
 			}else{
 				continue;
 			}
@@ -5190,7 +5190,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					continue;
 				}
 				if(cs2.getStartClassTime().compareTo(cs1.getEndClassTime())>=0){
-					if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
+					if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))){
 						courseRepeatIdMap.remove(cs1.getCourseId());
 					}
 					break;
@@ -5214,7 +5214,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					continue;
 				}
 			}
-			if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
+			if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))){
 				courseRepeatIdMap.remove(cs1.getCourseId());
 			}
 		}

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

@@ -3302,6 +3302,7 @@
         <result column="class_date_" property="classDate"/>
         <result column="class_start_time_" property="startClassTime"/>
         <result column="class_end_time_" property="endClassTime"/>
+        <result column="orgna_name_" property="organName"/>
         <collection property="teacherIds" ofType="int" javaType="list">
             <result column="teacher_id_"/>
         </collection>
@@ -3314,13 +3315,15 @@
         SELECT
             cs.id_ course_id_,
             cs.class_date_ class_date_,
+            o.name_ orgna_name_,
             CONCAT(cs.class_date_, ' ', cs.start_class_time_) class_start_time_,
             CONCAT(cs.class_date_, ' ', cs.end_class_time_) class_end_time_,
             csts.user_id_ teacher_id_,
             cssp.user_id_ student_id_
         FROM course_schedule cs
-        LEFT JOIN course_schedule_student_payment cssp ON cs.id_=cssp.course_schedule_id_
-        LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
+            LEFT JOIN course_schedule_student_payment cssp ON cs.id_=cssp.course_schedule_id_
+            LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
+            LEFT JOIN organization o ON cs.organ_id_=o.id_
         WHERE cs.organ_id_!=41 AND cs.del_flag_=0 AND cs.create_time_>'2020-11-01 00:00:00'
     </select>