Merge branch 'feature/1106_homework' into dev

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

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.EHomeWorkStatus;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.enums.ImSendTypeEnum;
+import com.ym.mec.biz.dal.enums.StandardEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -222,6 +223,9 @@ public class CourseHomeworkWrapper {
         @ApiModelProperty(value = "文件过期天数")
         private Integer fileExpireDay;
 
+        @ApiModelProperty(value = "0未达标、1达标、2优秀",required = true)
+        private StandardEnum standardFlag;
+
         @ApiModelProperty("练习内容")
         private List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> trainingDetailList;
 

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

@@ -937,6 +937,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                 return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(homework.getSubmitTime());
+            courseHomeworkDetail.setStandardFlag(homework.getStandardFlag());
         } else {
             courseHomeworkDetail = courseHomeworkService.findCourseExtraHomeworkDetail(query.getCourseScheduleId());
             ExtracurricularExercisesReply exercisesReply = extracurricularExercisesReplyDao.getByExtraIdAndUserId(courseHomeworkDetail.getCourseHomeworkId(), query.getUserId());
@@ -944,15 +945,18 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
                 return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(exercisesReply.getSubmitTime());
+            courseHomeworkDetail.setStandardFlag(exercisesReply.getStandardFlag());
         }
 
         // 获取作业信息
         List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> detailList = studentLessonTrainingDetailService.getBaseLessonTrainingDetail(
             courseHomeworkDetail.getCourseHomeworkId(), query.getType(), query.getUserId(),null);
 
-        long count = detailList.stream().filter(o -> o.getTrainingTimes() < o.getTimes()).count();
-        if (count >0) {
+        if (courseHomeworkDetail.getStandardFlag() == null) {
             courseHomeworkDetail.setFinishStatus(false);
+        } else
+        if( courseHomeworkDetail.getStandardFlag().equals(StandardEnum.STANDARD) || courseHomeworkDetail.getStandardFlag().equals(StandardEnum.EXCELLENT)) {
+            courseHomeworkDetail.setFinishStatus(true);
         } else {
             courseHomeworkDetail.setFinishStatus(true);
         }
@@ -997,7 +1001,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
             }
         } else if (studentLessonTrainingDetail.getTrainingStatus() == StandardEnum.NOT_START) {
-            studentLessonTrainingDetail.setTrainingStatus(StandardEnum.NOT_STANDARD);
+            studentLessonTrainingDetail.setTrainingStatus(StandardEnum.STANDARD);
         }
         if (CollectionUtils.isNotEmpty(record.getFileJson())) {
             studentLessonTrainingDetail.setFileJson(JSON.toJSONString(record.getFileJson()));