|
@@ -402,10 +402,6 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- if(userId == 2163133){
|
|
|
|
- System.out.println("********************");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
//有未上的单技课
|
|
//有未上的单技课
|
|
if(typeCourseMap.containsKey(CourseSchedule.CourseScheduleType.SINGLE) && isServiceWithMusicGroup){
|
|
if(typeCourseMap.containsKey(CourseSchedule.CourseScheduleType.SINGLE) && isServiceWithMusicGroup){
|
|
|
|
|
|
@@ -603,10 +599,6 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
|
|
- if(noCourseServeStudentId == 2163133){
|
|
|
|
- System.out.println("********************");
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
Map<Integer, Integer> teacherNumMap = new HashMap<>();
|
|
Map<Integer, Integer> teacherNumMap = new HashMap<>();
|
|
for (String groupId : musicGroupIds) {
|
|
for (String groupId : musicGroupIds) {
|
|
|
|
|
|
@@ -674,7 +666,6 @@ public class StudentServeServiceImpl implements StudentServeService {
|
|
.collect(Collectors.groupingBy(StudentServeCourseHomeworkDto::getUserId));
|
|
.collect(Collectors.groupingBy(StudentServeCourseHomeworkDto::getUserId));
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds), TenantContextHolder.getTenantId());
|
|
List<ExtracurricularExercisesReply> allStudentExercises = extracurricularExercisesReplyDao.getStudentExercisesWithTimeZone(monDayDate.toString(), sunDayDate.toString(), new ArrayList<>(allStudentIds), TenantContextHolder.getTenantId());
|
|
if(!CollectionUtils.isEmpty(allStudentExercises)){
|
|
if(!CollectionUtils.isEmpty(allStudentExercises)){
|
|
studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
|
|
studentExercisesMap = allStudentExercises.stream().collect(Collectors.groupingBy(ExtracurricularExercisesReply::getUserId));
|