Merge branch 'zx_saas_homework_1011' of http://git.dayaedu.com/yonge/mec into test

mec-application/src/main/java/com/ym/mec/student/controller/LessonExaminationController.java

@@ -16,6 +16,8 @@ import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -65,7 +67,11 @@ public class LessonExaminationController extends BaseController {
     @PostMapping("queryDetailAll")
     public HttpResponseResult<List<StudentLessonExaminationDetailDto>> queryAll(@RequestBody StudentLessonExaminationQueryDto query) {
         query.setUserId(sysUserService.getUserId());
-        return succeed(studentLessonExaminationDetailService.queryAll(query));
+        List<StudentLessonExaminationDetailDto> dtos = studentLessonExaminationDetailService.queryAll(query);
+        if(CollectionUtils.isEmpty(dtos)){
+            return failed(HttpStatus.NO_CONTENT,"作业不存在");
+        }
+        return succeed(dtos);
     }
 
     @ApiOperation(value = "获取学员单个作业详情")

mec-application/src/main/java/com/ym/mec/student/controller/StudentCourseHomeworkController.java

@@ -118,7 +118,7 @@ public class StudentCourseHomeworkController extends BaseController {
     public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList>
             findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query){
         query.setUserId(sysUserService.getUserId().longValue());
-        return succeed(studentCourseHomeworkService.findStudentHomeworkRecordDetail(query));
+        return studentCourseHomeworkService.findStudentHomeworkRecordDetail(query);
     }
 
     @ApiOperation(value = "获取学生作业课件列表")

mec-biz/src/main/java/com/ym/mec/biz/service/StudentCourseHomeworkService.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.ELessonTrainingType;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -124,7 +125,7 @@ public interface StudentCourseHomeworkService extends BaseService<Long, StudentC
      *
      * @return
      */
-    CourseHomeworkWrapper.CourseHomeworkList findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
+    HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
 
     List<StudentLessonTrainingDetailWrapper.StudentLessonTrainingDetail> findStudentHomeworkCourseware(CourseHomeworkWrapper.StudentCourseHomeworkQuery query);
 

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

@@ -11,7 +11,9 @@ import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.StudentCourseHomeWorkQueryInfo;
 import com.ym.mec.biz.service.*;
 import com.ym.mec.common.constant.CommonConstants;
+import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
@@ -23,6 +25,7 @@ import com.ym.mec.util.date.DateUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
+import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
@@ -867,7 +870,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
      * @return
      */
     @Override
-    public CourseHomeworkWrapper.CourseHomeworkList findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query) {
+    public HttpResponseResult<CourseHomeworkWrapper.CourseHomeworkList> findStudentHomeworkRecordDetail(CourseHomeworkWrapper.StudentCourseHomeworkQuery query) {
         CourseHomeworkWrapper.CourseHomeworkList courseHomeworkDetail = null;
         if (ELessonTrainingType.HOMEWORK.equals(query.getType())) {
             courseHomeworkDetail= courseHomeworkService.findCourseHomeworkDetail(
@@ -876,14 +879,14 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
             StudentCourseHomework homework = studentCourseHomeworkDao
                     .getHomeworkByUserIdAndCourseHomeworkId(query.getUserId(), courseHomeworkDetail.getCourseHomeworkId());
             if (homework == null) {
-                throw new BizException("作业不存在");
+                return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(homework.getSubmitTime());
         } else {
             courseHomeworkDetail = courseHomeworkService.findCourseExtraHomeworkDetail(query.getCourseScheduleId());
             ExtracurricularExercisesReply exercisesReply = extracurricularExercisesReplyDao.getByExtraIdAndUserId(courseHomeworkDetail.getCourseHomeworkId(), query.getUserId());
             if (exercisesReply == null) {
-                throw new BizException("作业不存在");
+                return BaseController.failed(HttpStatus.NO_CONTENT,"作业不存在");
             }
             courseHomeworkDetail.setSubmitTime(exercisesReply.getSubmitTime());
         }
@@ -900,8 +903,7 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
         }
         courseHomeworkDetail.setTrainingDetailList(detailList);
 
-        return courseHomeworkDetail;
-
+        return BaseController.succeed(courseHomeworkDetail);
     }
 
     @Override