新增训练说明

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

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
+
 import java.time.DayOfWeek;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -110,7 +111,6 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
         studentExtraExercise.setIsView(0);
         studentExtraExercise.setIsRepliedTimely(0);
         studentExtraExercise.setMusicScoreId(exercises.getMusicScoreId());
-        studentExtraExercise.setMemo(exercises.getMemo());
 
         List<ExtracurricularExercisesReply> extracurricularExercisesReplies = new ArrayList<>();
 
@@ -120,6 +120,7 @@ public class ExtracurricularExercisesServiceImpl extends BaseServiceImpl<Long, E
                 // 原本作业逻辑
                 for (Integer userId : musicScoreSubjectDto.getUserIdList()) {
                     studentExtraExercise.setUserId(userId);
+                    studentExtraExercise.setMemo(musicScoreSubjectDto.getMemo());
                     studentExtraExercise.setMusicScoreId(StringUtils.join(musicScoreSubjectDto.getMusicScoreIdList(),","));
                     studentExtraExercise.setMusicScoreContent(JSONObject.toJSONString(musicScoreSubjectDto.getMusicScoreHomeworkDtoList()));
                     extracurricularExercisesReplies.add(JSON.parseObject(JSON.toJSONString(studentExtraExercise),ExtracurricularExercisesReply.class));

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

@@ -424,7 +424,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                             studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
                                                                     .homeWorkDetail(scoreSubjectDto.getStudentLessonTrainingDetails(), userIdList,
                                                                             courseHomework.getId(),ELessonTrainingType.HOMEWORK, scoreSubjectDto.getGroup()));
-
+							studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(scoreSubjectDto.getMemo()));
 						}
 					}else {
 						studentCourseHomeworks.addAll(studentCourseHomeworkDao.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
@@ -438,6 +438,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
                                                                       .collect(Collectors.toList());
                         studentLessonTrainingDetails.addAll(studentLessonTrainingDetailService
                                                                 .homeWorkDetail(courseHomeworkInfo.getStudentLessonTrainingDetails(), userIdList,courseHomework.getId(),ELessonTrainingType.HOMEWORK,null));
+						studentCourseHomeworks.forEach(studentCourseHomework -> studentCourseHomework.setMemo(courseHomeworkInfo.getMemo()));
 
 					}
 					if(CollectionUtils.isEmpty(studentCourseHomeworks)){
@@ -445,7 +446,6 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 					}
                     for (StudentCourseHomework studentCourseHomework : studentCourseHomeworks) {
                         studentCourseHomework.setGroupType(teacherAttendance.getGroupType());
-						studentCourseHomework.setMemo(courseHomeworkInfo.getMemo());
                     }
 
                     if (!CollectionUtils.isEmpty(studentLessonTrainingDetails)) {