Browse Source

bug修改

zouxuan 4 months ago
parent
commit
9e3db8d4a3

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

@@ -5833,7 +5833,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<CourseScheduleTeacherSalary> courseScheduleTeacherSalaryList = new ArrayList<>();
 		List<CourseSchedule> courseScheduleList = new ArrayList<>();
 		//校验老师是否冲突
-		courseTimeDtoList.stream().forEach(e->classGroupTeacherMapperService.checkTeachingBishop(e.getClassGroupTeacherMapperList()));
+		courseTimeDtoList.forEach(e->classGroupTeacherMapperService.checkTeachingBishop(e.getClassGroupTeacherMapperList()));
 		LocalDateTime now = LocalDateTime.now().withHour(0).withMinute(0).withSecond(0).withNano(0);
 		//获取排课总时长
 		int totalCourseTimes = 0;
@@ -5867,16 +5867,16 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		int generateCourseTimes = 0;
 		WhileNode:
 		while (true) {
-			int dayOfWeek = now.getDayOfWeek().getValue();
+//			int dayOfWeek = now.getDayOfWeek().getValue();
 			for (CourseTimeDto courseTimeDto : courseTimeDtoList) {
 				List<ClassGroupTeacherMapper> newClassGroupTeacherMapperList = courseTimeDto.getClassGroupTeacherMapperList();
 				Integer teacherId = newClassGroupTeacherMapperList.stream().filter(ct -> TeachTypeEnum.BISHOP.equals(ct.getTeacherRole())).findAny().get().getUserId();
 				if (Objects.isNull(teacherId)) {
 					throw new BizException("请设置主教");
 				}
-				if (courseTimeDto.getDayOfWeek() < 1 || courseTimeDto.getDayOfWeek() > 7) {
-					throw new BizException("排课循环周期错误,请核查");
-				}
+//				if (courseTimeDto.getDayOfWeek() < 1 || courseTimeDto.getDayOfWeek() > 7) {
+//					throw new BizException("排课循环周期错误,请核查");
+//				}
 				if (Objects.isNull(courseTimeDto.getStartDate()) || Objects.isNull(courseTimeDto.getEndDate())) {
 					throw new BizException("排课循环周期错误,请核查");
 				}
@@ -5886,7 +5886,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 					continue;
 				}
 
-				if (!courseTimeDto.getDayOfWeek().equals(dayOfWeek)) continue;
+//				if (!courseTimeDto.getDayOfWeek().equals(dayOfWeek)) continue;
 
 				Date classDate = DateConvertor.toDate(now);