|
@@ -3611,11 +3611,9 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
Map<Long, List<TeacherAttendance>> courseTeacherAttendanceMap = teacherAttendances.stream().collect(Collectors.groupingBy(TeacherAttendance::getCourseScheduleId));
|
|
|
Map<Integer, Long> studentNumCourseMap = MapUtil.convertIntegerMap(studentAttendanceDao.countStudentAttendancesByCourses(courseScheduleIds));
|
|
|
Map<Long, String> studentIdMap = MapUtil.convertIntegerMap(courseScheduleStudentPaymentDao.getStudentIdMap(courseScheduleIds));
|
|
|
- List<Integer> teacherIds=new ArrayList<>();
|
|
|
- for (CourseScheduleEndDto courseScheduleEndDto : results) {
|
|
|
- teacherIds.add(courseScheduleEndDto.getActualTeacherId());
|
|
|
- }
|
|
|
- List<Map<Integer, String>> nameIdMaps = teacherDao.queryNameByIds(StringUtils.join(teacherIds,","));
|
|
|
+ List<Integer> teacherIds=results.stream().filter(t->Objects.nonNull(t.getActualTeacherId())).map(CourseSchedule::getActualTeacherId).collect(Collectors.toList());
|
|
|
+
|
|
|
+ List<Map<Integer, String>> nameIdMaps = teacherDao.queryNameByIdList(teacherIds);
|
|
|
Map<Integer, String> nameIdMap=MapUtil.convertIntegerMap(nameIdMaps);
|
|
|
|
|
|
Map<Integer, Group> classGroupIdGroupMap = groups.stream().collect(Collectors.toMap(Group::getClassGroupId, e -> e));
|