|
@@ -224,12 +224,12 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
|
|
|
MapUtil.populateMap(params, queryInfo);
|
|
|
params.put("teacherId", teacherId);
|
|
|
|
|
|
- List<CoursesGroup> teacherCourseGroups=new ArrayList<>();
|
|
|
+ List<CourseGroupTeacherCardDto> groupCards=new ArrayList<>();
|
|
|
int count = coursesGroupDao.countTeacherGroups(params);
|
|
|
if (count > 0) {
|
|
|
pageInfo.setTotal(count);
|
|
|
params.put("offset", pageInfo.getOffset());
|
|
|
- teacherCourseGroups = coursesGroupDao.findTeacherCourseGroups(params);
|
|
|
+ List<CoursesGroup> teacherCourseGroups = coursesGroupDao.findTeacherCourseGroups(params);
|
|
|
|
|
|
List<String> groupIds = teacherCourseGroups.stream().map(group -> String.valueOf(group.getId())).collect(Collectors.toList());
|
|
|
|
|
@@ -243,7 +243,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
|
|
|
List<GroupCourseTimesDto> groupsCourseTimesInfo = courseScheduleDao.findGroupsCourseTimesInfo(groupIds, GroupType.COMM);
|
|
|
Map<String, GroupCourseTimesDto> groupCourseTimesInfoMap = groupsCourseTimesInfo.stream().collect(Collectors.toMap(GroupCourseTimesDto::getGroupId, e -> e));
|
|
|
|
|
|
- List<CourseGroupTeacherCardDto> groupCards=new ArrayList<>();
|
|
|
+ groupCards=new ArrayList<>();
|
|
|
for (CoursesGroup teacherCourseGroup : teacherCourseGroups) {
|
|
|
CourseGroupTeacherCardDto groupCard=new CourseGroupTeacherCardDto();
|
|
|
groupCard.setId(teacherCourseGroup.getId());
|
|
@@ -266,7 +266,7 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
|
|
|
groupCards.add(groupCard);
|
|
|
}
|
|
|
}
|
|
|
- pageInfo.setRows(teacherCourseGroups);
|
|
|
+ pageInfo.setRows(groupCards);
|
|
|
return pageInfo;
|
|
|
}
|
|
|
|