j

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

@@ -383,38 +383,38 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             throw new BizException(errInfo.toString());
                         }
                         //助教冲突检测
-						if(Objects.isNull(preCourseSchedule.getId())){
-							IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(preCourseSchedule.getClassGroupId());
-							if(Objects.nonNull(integerAndIntegerListDto)){
-								preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
-							}
-						}else if(existCourseScheduleIds.contains(preCourseSchedule.getId())){
-							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(preCourseSchedule.getId());
-							if(Objects.nonNull(integerAndIntegerListDto)){
-								preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
-							}
-						}
-						if(Objects.isNull(backCourseSchedule.getId())){
-							IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId());
-							if(Objects.nonNull(integerAndIntegerListDto)){
-								backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
-							}
-						}else if(existCourseScheduleIds.contains(backCourseSchedule.getId())){
-							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(backCourseSchedule.getId());
-							if(Objects.nonNull(integerAndIntegerListDto)){
-								backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
-							}
-						}
-						if(!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())
-							&&!CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
-							List<Integer> repeatIds = preCourseSchedule.getTeachingTeacherIdList()
-									.stream().filter(backCourseSchedule.getTeachingTeacherIdList()::contains)
-									.collect(Collectors.toList());
-							if(!CollectionUtils.isEmpty(repeatIds)){
-								errInfo.append("安排的助教存在冲突");
-								throw new BizException(errInfo.toString());
-							}
-						}
+//						if(Objects.isNull(preCourseSchedule.getId())){
+//							IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(preCourseSchedule.getClassGroupId());
+//							if(Objects.nonNull(integerAndIntegerListDto)){
+//								preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+//							}
+//						}else if(existCourseScheduleIds.contains(preCourseSchedule.getId())){
+//							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(preCourseSchedule.getId());
+//							if(Objects.nonNull(integerAndIntegerListDto)){
+//								preCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+//							}
+//						}
+//						if(Objects.isNull(backCourseSchedule.getId())){
+//							IntegerAndIntegerListDto integerAndIntegerListDto = classGroupTeachingTeacherMap.get(backCourseSchedule.getClassGroupId());
+//							if(Objects.nonNull(integerAndIntegerListDto)){
+//								backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+//							}
+//						}else if(existCourseScheduleIds.contains(backCourseSchedule.getId())){
+//							IntegerAndIntegerListDto integerAndIntegerListDto = courseScheduleTeachingTeacherMap.get(backCourseSchedule.getId());
+//							if(Objects.nonNull(integerAndIntegerListDto)){
+//								backCourseSchedule.setTeachingTeacherIdList(integerAndIntegerListDto.getIds());
+//							}
+//						}
+//						if(!CollectionUtils.isEmpty(preCourseSchedule.getTeachingTeacherIdList())
+//							&&!CollectionUtils.isEmpty(backCourseSchedule.getTeachingTeacherIdList())){
+//							List<Integer> repeatIds = preCourseSchedule.getTeachingTeacherIdList()
+//									.stream().filter(backCourseSchedule.getTeachingTeacherIdList()::contains)
+//									.collect(Collectors.toList());
+//							if(!CollectionUtils.isEmpty(repeatIds)){
+//								errInfo.append("安排的助教存在冲突");
+//								throw new BizException(errInfo.toString());
+//							}
+//						}
                         //学生冲突检测
                         if(preCourseSchedule.getClassGroupId().equals(backCourseSchedule.getClassGroupId())){
                             //如果班级相同，则学生肯定存在冲突