|
@@ -88,8 +88,9 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
|
|
dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- long count = haveCourseStudents.stream().filter(e -> GroupType.PRACTICE.equals(e.getGroupType()) ||
|
|
|
|
- (GroupType.MUSIC.equals(e.getGroupType()) && TeachModeEnum.OFFLINE.equals(e.getTeachMode()))).count();
|
|
|
|
|
|
+ long count = haveCourseStudents.stream().filter(e -> (GroupType.PRACTICE.equals(e.getGroupType()) ||
|
|
|
|
+ (GroupType.MUSIC.equals(e.getGroupType()) && TeachModeEnum.OFFLINE.equals(e.getTeachMode())))
|
|
|
|
+ &&nextMonday.after(e.getCourseStartTime())).count();
|
|
if(count>0){
|
|
if(count>0){
|
|
haveClassStudentIds.add(studentCoursesEntry.getKey());
|
|
haveClassStudentIds.add(studentCoursesEntry.getKey());
|
|
}else{
|
|
}else{
|