|
@@ -893,13 +893,23 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
|
|
|
if (ELessonTrainingType.HOMEWORK.equals(query.getType())) {
|
|
|
courseHomeworkDetail= courseHomeworkService.findCourseHomeworkDetail(
|
|
|
query.getCourseScheduleId());
|
|
|
+
|
|
|
+ StudentCourseHomework homework = studentCourseHomeworkDao
|
|
|
+ .getHomeworkByUserIdAndCourseHomeworkId(query.getUserId(), courseHomeworkDetail.getCourseHomeworkId());
|
|
|
+ if (homework == null) {
|
|
|
+ throw new BizException("作业不存在");
|
|
|
+ }
|
|
|
+ courseHomeworkDetail.setSubmitTime(homework.getSubmitTime());
|
|
|
} else {
|
|
|
courseHomeworkDetail = courseHomeworkService.findCourseExtraHomeworkDetail(query.getCourseScheduleId());
|
|
|
- }
|
|
|
- if (courseHomeworkDetail == null) {
|
|
|
- throw new BizException("作业不存在");
|
|
|
+ ExtracurricularExercisesReply exercisesReply = extracurricularExercisesReplyDao.getByExtraIdAndUserId(courseHomeworkDetail.getCourseHomeworkId(), query.getUserId());
|
|
|
+ if (exercisesReply == null) {
|
|
|
+ throw new BizException("作业不存在");
|
|
|
+ }
|
|
|
+ courseHomeworkDetail.setSubmitTime(exercisesReply.getSubmitTime());
|
|
|
}
|
|
|
|
|
|
+ // 获取作业信息
|
|
|
List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> detailList = studentLessonTrainingDetailService.getBaseLessonTrainingDetail(
|
|
|
courseHomeworkDetail.getCourseHomeworkId(), query.getType(), query.getUserId());
|
|
|
|