fix

src/main/java/cn/com/qmth/scancentral/controller/admin/ImageCheckController.java

@@ -1,27 +1,33 @@
 package cn.com.qmth.scancentral.controller.admin;
 
-import cn.com.qmth.scancentral.controller.BaseController;
-import cn.com.qmth.scancentral.enums.ImageCheckStatus;
-import cn.com.qmth.scancentral.service.ImageCheckService;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckQuery;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.core.collection.PageResult;
 import com.qmth.boot.tools.excel.ExcelWriter;
 import com.qmth.boot.tools.excel.enums.ExcelType;
 import com.qmth.boot.tools.iterator.PageListIterator;
+
+import cn.com.qmth.scancentral.controller.BaseController;
+import cn.com.qmth.scancentral.service.ImageCheckService;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckFailedQuery;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.Collection;
-import java.util.List;
 
 @RestController
 @Api(tags = "图片检查相关接口")
@@ -40,14 +46,13 @@ public class ImageCheckController extends BaseController {
 
     @ApiOperation(value = "查询图片检查异常（分页）")
     @PostMapping(value = "/failed/page")
-    public PageResult<ImageCheckDetailVo> failedPage(ImageCheckQuery query) {
-        query.setImageCheckStatus(ImageCheckStatus.FAILED);
-        return imageCheckService.detailList(query);
+    public PageResult<ImageCheckDetailVo> failedPage(ImageCheckFailedQuery query) {
+        return imageCheckService.failedPage(query);
     }
 
     @ApiOperation(value = "导出图片检查异常")
     @GetMapping(value = "/failed/export")
-    public void failedExport(ImageCheckQuery query, HttpServletResponse response) throws IOException {
+    public void failedExport(ImageCheckFailedQuery query, HttpServletResponse response) throws IOException {
         String fileName = URLEncoder.encode("图片检查异常", "UTF-8");
         response.setHeader("Content-Disposition", "inline; filename=" + fileName + ".xlsx");
         response.setContentType("application/vnd.ms-excel");
@@ -58,8 +63,7 @@ public class ImageCheckController extends BaseController {
             public Collection<ImageCheckDetailVo> getPageList(int pageNumber, int pageSize) {
                 query.setPageNumber(pageNumber);
                 query.setPageSize(pageSize);
-                query.setImageCheckStatus(ImageCheckStatus.FAILED);
-                PageResult<ImageCheckDetailVo> page = imageCheckService.detailList(query);
+                PageResult<ImageCheckDetailVo> page = imageCheckService.failedPage(query);
                 return page.getResult();
             }
 

src/main/java/cn/com/qmth/scancentral/dao/StudentDao.java

@@ -26,7 +26,7 @@ import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExamRoomExport;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExport;
 import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckQuery;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckFailedQuery;
 import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
 import cn.com.qmth.scancentral.vo.student.StudentAnswerVo;
 import cn.com.qmth.scancentral.vo.student.StudentExamRoomVo;
@@ -107,8 +107,7 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
 
     List<ImageCheckVo> countImageCheck(@Param("examId") Long examId);
 
-    IPage<ImageCheckDetailVo> queryImageCheckDetail(Page<ImageCheckDetailVo> page,
-            @Param("query") ImageCheckQuery query);
+    IPage<ImageCheckDetailVo> failedPage(Page<ImageCheckDetailVo> page, @Param("query") ImageCheckFailedQuery query);
 
     List<AssignedCheckExamRoomExport> exportAssignedCheck(@Param("examId") Long examId,
             @Param("subjectCode") String subjectCode);

src/main/java/cn/com/qmth/scancentral/service/ImageCheckService.java

@@ -1,18 +1,19 @@
 package cn.com.qmth.scancentral.service;
 
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckQuery;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
+import java.util.List;
+
 import com.qmth.boot.core.collection.PageResult;
 
-import java.util.List;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckFailedQuery;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
 
 public interface ImageCheckService {
 
     List<ImageCheckVo> list(Long examId);
 
-    PageResult<ImageCheckDetailVo> detailList(ImageCheckQuery query);
-
     void check(Long examId);
 
+    PageResult<ImageCheckDetailVo> failedPage(ImageCheckFailedQuery query);
+
 }

src/main/java/cn/com/qmth/scancentral/service/impl/ImageCheckServiceImpl.java

@@ -1,16 +1,7 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import cn.com.qmth.scancentral.dao.StudentDao;
-import cn.com.qmth.scancentral.service.ImageCheckService;
-import cn.com.qmth.scancentral.service.ToolExportService;
-import cn.com.qmth.scancentral.util.MathUtil;
-import cn.com.qmth.scancentral.util.PageUtil;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckQuery;
-import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qmth.boot.core.collection.PageResult;
+import java.util.List;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -18,7 +9,18 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.boot.core.collection.PageResult;
+
+import cn.com.qmth.scancentral.dao.StudentDao;
+import cn.com.qmth.scancentral.service.ImageCheckService;
+import cn.com.qmth.scancentral.service.ToolExportService;
+import cn.com.qmth.scancentral.util.MathUtil;
+import cn.com.qmth.scancentral.util.PageUtil;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckFailedQuery;
+import cn.com.qmth.scancentral.vo.imagecheck.ImageCheckVo;
 
 @Component
 public class ImageCheckServiceImpl implements ImageCheckService {
@@ -51,15 +53,15 @@ public class ImageCheckServiceImpl implements ImageCheckService {
     }
 
     @Override
-    public PageResult<ImageCheckDetailVo> detailList(ImageCheckQuery query) {
+    public PageResult<ImageCheckDetailVo> failedPage(ImageCheckFailedQuery query) {
         if (query.getExamId() == null) {
             throw new IllegalArgumentException("考试ID不能为空");
         }
         if (StringUtils.isBlank(query.getSubjectCode())) {
             throw new IllegalArgumentException("科目代码不能为空");
         }
-        IPage<ImageCheckDetailVo> page = studentDao
-                .queryImageCheckDetail(new Page<>(query.getPageNumber(), query.getPageSize()), query);
+        IPage<ImageCheckDetailVo> page = studentDao.failedPage(new Page<>(query.getPageNumber(), query.getPageSize()),
+                query);
 
         for (ImageCheckDetailVo vo : page.getRecords()) {
             vo.setFailed(vo.getFailedCount() > 0);

src/main/java/cn/com/qmth/scancentral/vo/imagecheck/ImageCheckQuery.java → src/main/java/cn/com/qmth/scancentral/vo/imagecheck/ImageCheckFailedQuery.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.vo.imagecheck;
 
-import cn.com.qmth.scancentral.enums.ImageCheckStatus;
 import cn.com.qmth.scancentral.util.PagerQuery;
 import io.swagger.annotations.ApiModelProperty;
 
-public class ImageCheckQuery extends PagerQuery {
+public class ImageCheckFailedQuery extends PagerQuery {
 
     @ApiModelProperty(value = "考试ID")
     private Long examId;
@@ -12,9 +11,6 @@ public class ImageCheckQuery extends PagerQuery {
     @ApiModelProperty(value = "科目代码")
     private String subjectCode;
 
-    @ApiModelProperty(value = "图片检查状态", hidden = true)
-    private ImageCheckStatus imageCheckStatus;
-
     public Long getExamId() {
         return examId;
     }
@@ -31,12 +27,4 @@ public class ImageCheckQuery extends PagerQuery {
         this.subjectCode = subjectCode;
     }
 
-    public ImageCheckStatus getImageCheckStatus() {
-        return imageCheckStatus;
-    }
-
-    public void setImageCheckStatus(ImageCheckStatus imageCheckStatus) {
-        this.imageCheckStatus = imageCheckStatus;
-    }
-
 }

src/main/resources/mapper/StudentMapper.xml

@@ -684,7 +684,7 @@
         group by stu.subject_code
     </select>
 
-    <select id="queryImageCheckDetail" resultType="cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo">
+    <select id="failedPage" resultType="cn.com.qmth.scancentral.vo.imagecheck.ImageCheckDetailVo">
         select stu.subject_code,
         sb.name as subject_name,
         stu.campus_code,
@@ -699,9 +699,7 @@
         inner join sc_subject sb on sb.exam_id = stu.exam_id and sb.code = stu.subject_code
         where stu.exam_id = #{query.examId}
         and stu.subject_code = #{query.subjectCode}
-        <if test="query.imageCheckStatus != null">
-            and stu.image_check_status = #{query.imageCheckStatus}
-        </if>
+        and (stu.file_upload_status = 'ERROR' or stu.image_check_status = 'FAILED')
         group by stu.exam_room
     </select>