|
@@ -464,8 +464,13 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
courseScheduleDto.setStatus(CourseStatusEnum.UNDERWAY);
|
|
|
}
|
|
|
if (Objects.nonNull(courseScheduleDto.getClassGroupId())) {
|
|
|
- String[] studentNames = classGroupStudentMapperDao.findCourseStudentName(courseScheduleDto.getId().intValue());
|
|
|
- courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNames, ","));
|
|
|
+// String[] studentNames = classGroupStudentMapperDao.findCourseStudentName(courseScheduleDto.getId().intValue());
|
|
|
+ List<StudentNameAndPhoneDto> courseStudentNameAndPhone = classGroupStudentMapperDao.findCourseStudentNameAndPhone(courseScheduleDto.getId().intValue());
|
|
|
+ if(!CollectionUtils.isEmpty(courseStudentNameAndPhone)){
|
|
|
+ List<String> studentNames = courseStudentNameAndPhone.stream().map(StudentNameAndPhoneDto::getUserName).collect(Collectors.toList());
|
|
|
+ courseScheduleDto.setStudentNames(org.apache.commons.lang3.StringUtils.join(studentNames, ","));
|
|
|
+ courseScheduleDto.setStudents(courseStudentNameAndPhone);
|
|
|
+ }
|
|
|
}
|
|
|
courseScheduleDto.setSubjectName(subjectNameCourseMap.get(courseScheduleDto.getId()));
|
|
|
courseScheduleDto.setSubjectId(subjectIdCourseMap.get(courseScheduleDto.getId()));
|