|
@@ -1375,7 +1375,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
for (CourseSchedule courseSchedule : courseSchedules) {
|
|
|
boolean b = checkSingleCourseConflict(courseSchedule, courseSchedules, result);
|
|
|
if(!b){
|
|
|
- courseSchedule = idCourseMap.get(courseSchedule.getId());
|
|
|
+ result.get("failed").add(idCourseMap.get(courseSchedule.getId()));
|
|
|
}
|
|
|
}
|
|
|
return result;
|
|
@@ -1440,7 +1440,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Map<Long, Set<Integer>> courseLeaveStudentIdsMap = new HashMap<>();
|
|
|
for (StudentAttendance sa : studentAttendances) {
|
|
|
if(sa.getCourseScheduleId().equals(courseSchedule.getId())&&!StudentAttendanceStatusEnum.LEAVE.equals(sa.getStatus())){
|
|
|
- result.get("failed").add(courseSchedule);
|
|
|
return false;
|
|
|
}
|
|
|
if(!courseLeaveStudentIdsMap.containsKey(sa.getCourseScheduleId())){
|
|
@@ -1523,8 +1522,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
boolean b = courseTimeRevise(courseSchedule, repeatCourses);
|
|
|
if(b){
|
|
|
result.get("revise").add(courseSchedule);
|
|
|
- }else{
|
|
|
- result.get("failed").add(courseSchedule);
|
|
|
}
|
|
|
return b;
|
|
|
}
|