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

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

@@ -5172,6 +5172,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());
 			}else{
 				continue;
 			}
@@ -5183,8 +5184,11 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(cs2.getEndClassTime().compareTo(cs1.getStartClassTime())<=0){
 					continue;
 				}
+				if(courseRepeatIdMap.containsKey(cs2.getCourseId())&&courseRepeatIdMap.get(cs2.getCourseId()).contains(cs1.getCourseId())){
+					continue;
+				}
 				if(cs2.getStartClassTime().compareTo(cs1.getEndClassTime())>=0){
-					if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))){
+					if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
 						courseRepeatIdMap.remove(cs1.getCourseId());
 					}
 					break;
@@ -5205,7 +5209,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 //					continue;
 //				}
 			}
-			if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))){
+			if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
 				courseRepeatIdMap.remove(cs1.getCourseId());
 			}
 		}

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

@@ -3300,12 +3300,12 @@
             cs.class_date_ class_date_,
             CONCAT(cs.class_date_, ' ', cs.start_class_time_) class_start_time_,
             CONCAT(cs.class_date_, ' ', cs.end_class_time_) class_end_time_,
-            cssp.user_id_ teacher_id_,
-            csts.user_id_ student_id_
+            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_
-        WHERE cs.organ_id_!=41 AND cs.del_flag_=0 AND cs.create_time_>'2020-01-01 00:00:00' AND cs.create_time_<'3000-01-01 00:00:00'
+        WHERE cs.organ_id_!=41 AND cs.del_flag_=0 AND cs.create_time_>'2020-03-01 00:00:00' AND cs.create_time_<'3000-01-01 00:00:00'
     </select>
 
 </mapper>