|
@@ -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)) {
|