Merge remote-tracking branch 'origin/feature_HW_20230331' into feature_HW_20230331

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

@@ -834,9 +834,9 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
                         String userId = split[0];
                         SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
                         if (split.length == 1) {
-                            courseHomeworkList.setMusicGroupName(sysUser.getUsername());
+                            courseHomeworkList.setClassGroupName(sysUser.getUsername());
                         } else {
-                            courseHomeworkList.setMusicGroupName(sysUser.getUsername() + "等" + split.length + "名学员");
+                            courseHomeworkList.setClassGroupName(sysUser.getUsername() + "等" + split.length + "名学员");
                         }
                     }
                 }

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

@@ -344,7 +344,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 				teacherAttendanceDao.insert(teacherAttendance);
 			}
 
-			if(StringUtils.isNotBlank(courseHomeworkInfo.getContent()) || !CollectionUtils.isEmpty(courseHomeworkInfo.getStudentLessonTrainingDetails())){
+            if(!CollectionUtils.isEmpty(courseHomeworkInfo.getMusicScoreSubjectDto())){
 				CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(teacherAttendance.getCourseScheduleId());
 				if(Objects.isNull(courseHomework)){
 					//新增课堂作业