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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseHomeworkWrapper.java

@@ -135,6 +135,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty("完成状态 false 未完成 true 已完成")
         private Boolean finishStatus;
 
+        @ApiModelProperty("提交时间")
+        private Date submitTime;
+
         @ApiModelProperty(value = "作业类型 来源（HOMEWORK,EXTRACURRICULAR,EXTRA）",required = true)
         private ELessonTrainingType type;
 

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
@@ -93,9 +94,9 @@ public class ExtracurricularExercisesReplyServiceImpl extends BaseServiceImpl<Lo
         }
 
         List<StudentCourseHomework> studentCourseHomeworks=new ArrayList<>();
-		for (ExtraExerciseStudentsDto extraExerciseStudent : extraExerciseStudents) {
-			StudentCourseHomework studentCourseHomework=new StudentCourseHomework();
-			studentCourseHomework.setId(extraExerciseStudent.getId());
+        for (ExtraExerciseStudentsDto extraExerciseStudent : extraExerciseStudents) {
+            StudentCourseHomework studentCourseHomework= JSON.parseObject(JSON.toJSONString(extraExerciseStudent),StudentCourseHomework.class);
+            studentCourseHomework.setId(extraExerciseStudent.getId());
             studentCourseHomework.setCourseHomeworkId(extraExerciseId);
             studentCourseHomework.setCourseScheduleId(extraExerciseId);
 			studentCourseHomework.setUserId(extraExerciseStudent.getUserId());

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

@@ -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());