Merge branch 'feature/0427-school' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -5675,7 +5675,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());
@@ -5719,10 +5719,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){