update

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

@@ -5178,6 +5178,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		courseRepeatCheckInfos.sort(Comparator.comparing(CourseRepeatCheckDto::getStartClassTime));
 		Map<Date, List<CourseRepeatCheckDto>> dayCourseMap = courseRepeatCheckInfos.stream().collect(Collectors.groupingBy(CourseRepeatCheckDto::getClassDate));
 		Map<Long, List<Long>> courseRepeatIdMap = new HashMap<>();
+		int needAdjustCourseNum = 0;
 		for (CourseRepeatCheckDto cs1 : courseRepeatCheckInfos) {
 			if(!courseRepeatIdMap.containsKey(cs1.getCourseId())){
 				courseRepeatIdMap.put(cs1.getCourseId(), new ArrayList<>());
@@ -5209,21 +5210,24 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				if(repeatTeacherNums>0){
 					System.out.println(cs1.getCourseId() + "," + cs2.getCourseId());
 					courseRepeatIdMap.get(cs1.getCourseId()).add(cs2.getCourseId());
+					needAdjustCourseNum++;
 					continue;
 				}
 
-//				long repeatStudentNums = cs1.getStudentIds().stream().filter(studentId -> cs2.getStudentIds().contains(studentId)).count();
-//				if(repeatStudentNums>0){
-//					System.out.println(cs1.getCourseId() + "," + cs2.getCourseId());
-//					courseRepeatIdMap.get(cs1.getCourseId()).add(cs2.getCourseId());
-//					continue;
-//				}
+				long repeatStudentNums = cs1.getStudentIds().stream().filter(studentId -> cs2.getStudentIds().contains(studentId)).count();
+				if(repeatStudentNums>0){
+					System.out.println(cs1.getCourseId() + "," + cs2.getCourseId());
+					courseRepeatIdMap.get(cs1.getCourseId()).add(cs2.getCourseId());
+					needAdjustCourseNum++;
+					continue;
+				}
 			}
 			if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
 				courseRepeatIdMap.remove(cs1.getCourseId());
 			}
 		}
 		System.out.println("重复课程：" + JSON.toJSONString(courseRepeatIdMap));
+		System.out.println("需调整课程数量：" + needAdjustCourseNum);
 		System.out.println("重复课程数量：" + courseRepeatIdMap.size());
 	}
 }

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

@@ -3311,7 +3311,7 @@
         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-03-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-11-01 00:00:00' AND cs.create_time_<'3000-01-01 00:00:00'
     </select>
 
 </mapper>