|
@@ -257,7 +257,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(new ArrayList<>(courseIds));
|
|
List<CourseSchedule> courseSchedules = courseScheduleDao.findByCourseScheduleIds(new ArrayList<>(courseIds));
|
|
Set<Long> overCourseIds = courseSchedules.stream().filter(c->CourseStatusEnum.OVER.equals(c.getStatus())).map(CourseSchedule::getId).collect(Collectors.toSet());
|
|
Set<Long> overCourseIds = courseSchedules.stream().filter(c->CourseStatusEnum.OVER.equals(c.getStatus())).map(CourseSchedule::getId).collect(Collectors.toSet());
|
|
for (StudentExtracurricularExercisesSituation sees : teacherServeWithDate) {
|
|
for (StudentExtracurricularExercisesSituation sees : teacherServeWithDate) {
|
|
- if(sees.getExpectExercisesNum()>=sees.getActualExercisesNum()){
|
|
|
|
|
|
+ if(sees.getActualExercisesNum()>=sees.getExpectExercisesNum()){
|
|
serveIds.add(sees.getId());
|
|
serveIds.add(sees.getId());
|
|
}else{
|
|
}else{
|
|
if(StringUtils.isBlank(sees.getCourseIds())){
|
|
if(StringUtils.isBlank(sees.getCourseIds())){
|
|
@@ -270,7 +270,7 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
|
|
overCourseNum+=1;
|
|
overCourseNum+=1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(sees.getExpectExercisesNum()>=overCourseNum){
|
|
|
|
|
|
+ if(sees.getActualExercisesNum()>=overCourseNum){
|
|
serveIds.add(sees.getId());
|
|
serveIds.add(sees.getId());
|
|
}
|
|
}
|
|
}
|
|
}
|