xiatian vor 8 Monaten
Ursprung
Commit
7be0962e73

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

@@ -3,11 +3,6 @@ package cn.com.qmth.scancentral.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-import cn.com.qmth.scancentral.enums.ImageCheckStatus;
-import cn.com.qmth.scancentral.enums.UploadStatus;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -20,7 +15,10 @@ 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.entity.SubjectEntity;
 import cn.com.qmth.scancentral.service.ImageCheckService;
+import cn.com.qmth.scancentral.service.StudentService;
+import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.service.ToolExportService;
 import cn.com.qmth.scancentral.util.MathUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
@@ -35,29 +33,31 @@ public class ImageCheckServiceImpl implements ImageCheckService {
 
     @Autowired
     private ToolExportService toolExportService;
+
     @Autowired
     private StudentDao studentDao;
+
     @Autowired
     private SubjectService subjectService;
+
     @Autowired
     private StudentService studentService;
+
     @Override
     public List<ImageCheckVo> list(Long examId) {
         if (examId == null) {
             throw new IllegalArgumentException("考试ID不能为空");
         }
-        List<SubjectEntity> subjectList =subjectService.listByExamId(examId);
-//        List<ImageCheckVo> result = studentDao.countImageCheck(examId);
+        List<SubjectEntity> subjectList = subjectService.listByExamId(examId);
+        // List<ImageCheckVo> result = studentDao.countImageCheck(examId);
         List<ImageCheckVo> result = new ArrayList<>();
-        for (SubjectEntity subject: subjectList) {
-            ImageCheckVo vo =new ImageCheckVo();
+        for (SubjectEntity subject : subjectList) {
+            ImageCheckVo vo = new ImageCheckVo();
             vo.setSubjectCode(subject.getCode());
             vo.setSubjectName(subject.getName());
-            vo.setTotalCount(studentService.countByExamIdAndSubjectCode(examId,subject.getCode()));
-            List<ImageCheckStatus> imageCheckStatusList = new ArrayList<>();
-            List<UploadStatus> fileUploadStatusList = new ArrayList<>();
-            vo.setFailedCount(studentService.getImageCheckFailedCount(examId,subject.getCode()));
-            vo.setDisposedCount(studentService.getImageCheckDisposedCount(examId,subject.getCode()));
+            vo.setTotalCount(studentService.countByExamIdAndSubjectCode(examId, subject.getCode()));
+            vo.setFailedCount(studentService.getImageCheckFailedCount(examId, subject.getCode()));
+            vo.setDisposedCount(studentService.getImageCheckDisposedCount(examId, subject.getCode()));
             if (vo.getTotalCount() == null || vo.getTotalCount() == 0) {
                 vo.setImageCheckProgress(null);
             } else {

+ 1 - 0
src/main/java/cn/com/qmth/scancentral/service/impl/ToolExportServiceImpl.java

@@ -207,6 +207,7 @@ public class ToolExportServiceImpl implements ToolExportService {
                 throw new StatusException("拼接图片大小有误");
             }
         }
+        studentService.updateImageCheckStatus(student.getId(), ImageCheckStatus.SUCCESS);
     }
 
     @Override