|
|
@@ -5670,7 +5670,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
for (CourseStudentDto dto : courseStudentDtos) {
|
|
|
SimpleUserDto userDto = simpleUserDtoMap.get(dto.getStudentId());
|
|
|
if(Objects.nonNull(userDto)){
|
|
|
- dto.setStudentName(userDto.getUserName());
|
|
|
+ dto.setStudentName(userDto.getNickName());
|
|
|
dto.setStudentAvatar(userDto.getAvatar());
|
|
|
}
|
|
|
dto.setCourseStatus(courseSchedule.getStatus());
|
|
|
@@ -5714,10 +5714,12 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
|
|
|
ClassesForDayDto dayDto = dtoMap.get(dto.getCourseId());
|
|
|
if(Objects.nonNull(dayDto)){
|
|
|
dto.setStudentNum(dayDto.getStudentNum());
|
|
|
- dto.setAttendanceNormalNum(dayDto.getAttendanceNormalNum());
|
|
|
- dto.setAttendanceLateNum(dayDto.getAttendanceLateNum());
|
|
|
- dto.setAttendanceLeaveNum(dayDto.getAttendanceLeaveNum());
|
|
|
- dto.setAttendanceTruantNum(dayDto.getAttendanceTruantNum());
|
|
|
+ if(dto.getCourseStatus() != CourseStatusEnum.NOT_START){
|
|
|
+ dto.setAttendanceNormalNum(dayDto.getAttendanceNormalNum());
|
|
|
+ dto.setAttendanceLateNum(dayDto.getAttendanceLateNum());
|
|
|
+ dto.setAttendanceLeaveNum(dayDto.getAttendanceLeaveNum());
|
|
|
+ dto.setAttendanceTruantNum(dayDto.getAttendanceTruantNum());
|
|
|
+ }
|
|
|
}
|
|
|
Long homeworkId = homeworkMap.get(dayDto.getCourseId());
|
|
|
if(homeworkId != null){
|
zouxuan