|
@@ -1347,7 +1347,18 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
|
|
|
@Override
|
|
|
public CourseScheduleDto getRecentCourseSchedule(Integer userId) {
|
|
|
- return courseScheduleDao.getRecentCourseSchedule(userId);
|
|
|
+ CourseScheduleDto courseSchedule = courseScheduleDao.getRecentCourseSchedule(userId);
|
|
|
+ if(Objects.nonNull(courseSchedule)){
|
|
|
+ if (Objects.nonNull(courseSchedule.getClassGroupId())) {
|
|
|
+ List<StudentNameAndPhoneDto> courseStudentNameAndPhone = classGroupStudentMapperDao.findCourseStudentNameAndPhone(courseSchedule.getId().intValue());
|
|
|
+ if(!CollectionUtils.isEmpty(courseStudentNameAndPhone)){
|
|
|
+ List<String> studentNames = courseStudentNameAndPhone.stream().filter(s->Objects.nonNull(s)&&Objects.nonNull(s.getUserName())).map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
|
|
|
+ courseSchedule.setStudentNames(StringUtils.join(studentNames, ","));
|
|
|
+// courseSchedule.setStudents(courseStudentNameAndPhone);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return courseSchedule;
|
|
|
}
|
|
|
|
|
|
// 数据整理
|