|
@@ -85,7 +85,12 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
|
continue;
|
|
|
}
|
|
|
if(studentServeDto.getCourseStartTime().after(nextMonday)){
|
|
|
- dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
|
|
|
+ long pvc=haveCourseStudents.stream().filter(e -> (GroupType.PRACTICE.equals(e.getGroupType())||GroupType.VIP.equals(e.getGroupType()))).count();
|
|
|
+ if(pvc>0){
|
|
|
+ dontServeInCurrentWeekStudentIds.add(studentCoursesEntry.getKey());
|
|
|
+ }else{
|
|
|
+ noClassStudentIds.add(studentCoursesEntry.getKey());
|
|
|
+ }
|
|
|
continue;
|
|
|
}
|
|
|
long count = haveCourseStudents.stream().filter(e -> (GroupType.PRACTICE.equals(e.getGroupType()) ||
|