|
@@ -5205,19 +5205,19 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
if(cs1.getStartClassTime().compareTo(cs2.getEndClassTime())>=0||cs1.getEndClassTime().compareTo(cs2.getStartClassTime())<=0){
|
|
|
continue;
|
|
|
}
|
|
|
-// long repeatTeacherNums = cs1.getTeacherIds().stream().filter(teacherId -> cs2.getTeacherIds().contains(teacherId)).count();
|
|
|
-// if(repeatTeacherNums>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){
|
|
|
+ long repeatTeacherNums = cs1.getTeacherIds().stream().filter(teacherId -> cs2.getTeacherIds().contains(teacherId)).count();
|
|
|
+ if(repeatTeacherNums>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());
|
|
|
+// continue;
|
|
|
+// }
|
|
|
}
|
|
|
if(CollectionUtils.isEmpty(courseRepeatIdMap.get(cs1.getCourseId()))||courseRepeatIdMap.get(cs1.getCourseId()).size()==1){
|
|
|
courseRepeatIdMap.remove(cs1.getCourseId());
|