|
@@ -221,22 +221,31 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
|
|
|
}
|
|
|
|
|
|
//新增课堂作业
|
|
|
- CourseHomework courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
|
|
|
+ CourseHomework courseHomework = courseHomeworkDao.findByCourseSchedule(teacherAttendance.getCourseScheduleId());
|
|
|
if(Objects.nonNull(courseHomework)&&StringUtils.isNotBlank(courseHomework.getContent())){
|
|
|
- courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
|
|
|
- courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
|
|
|
- courseHomework.setGroupType(teacherAttendance.getGroupType());
|
|
|
- courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
|
|
|
- courseHomework.setExpiryDate(DateUtil.addDays(date,7));
|
|
|
- courseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(teacherAttendance.getCourseScheduleId()));
|
|
|
- courseHomeworkService.insert(courseHomework);
|
|
|
- List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
|
|
|
- .constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
|
|
|
- courseHomework.getId());
|
|
|
- if(CollectionUtils.isEmpty(studentCourseHomeworks)){
|
|
|
- throw new BizException("此课程没有学生");
|
|
|
+ if(Objects.isNull(courseHomework)){
|
|
|
+ courseHomework=teacherSignOutDto.getCourseHomeworkInfo();
|
|
|
+ courseHomework.setCourseScheduleId(teacherAttendance.getCourseScheduleId());
|
|
|
+ courseHomework.setMusicGroupId(currentCourseDetail.getMusicGroupId());
|
|
|
+ courseHomework.setGroupType(teacherAttendance.getGroupType());
|
|
|
+ courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
|
|
|
+ courseHomework.setExpiryDate(DateUtil.addDays(date,7));
|
|
|
+ courseHomework.setExpectNum(courseScheduleDao.countCourseStudentNum(teacherAttendance.getCourseScheduleId()));
|
|
|
+ }
|
|
|
+ courseHomework.setContent(courseHomework.getContent());
|
|
|
+ courseHomework.setAttachments(courseHomework.getAttachments());
|
|
|
+ if(Objects.isNull(courseHomework)){
|
|
|
+ courseHomeworkService.insert(courseHomework);
|
|
|
+ List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
|
|
|
+ .constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),
|
|
|
+ courseHomework.getId());
|
|
|
+ if(CollectionUtils.isEmpty(studentCourseHomeworks)){
|
|
|
+ throw new BizException("此课程没有学生");
|
|
|
+ }
|
|
|
+ studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
|
|
|
+ }else{
|
|
|
+ courseHomeworkService.update(courseHomework);
|
|
|
}
|
|
|
- studentCourseHomeworkDao.batchInsertStudentCourseHomeworkRecord(studentCourseHomeworks);
|
|
|
}
|
|
|
return result;
|
|
|
}
|