fix

install/mysql/init/scan_central_db.sql

@@ -89,7 +89,6 @@ CREATE TABLE IF NOT EXISTS `sc_exam`
     `exam_number_fill_count`           int         DEFAULT NULL,
     `paper_type_barcode_content`       text        DEFAULT NULL,
     `absent_barcode_content`           varchar(16) DEFAULT NULL,
-    `image_transfer_mode`              varchar(32) DEFAULT NULL,
     `image_check_ratio`                double      DEFAULT NULL,
     `image_check_order`                varchar(50) DEFAULT NULL,
     `scanner_assigned_max_count`       int         DEFAULT NULL,

src/main/java/cn/com/qmth/scancentral/bean/ExamConfigDomain.java

@@ -1,11 +1,11 @@
 package cn.com.qmth.scancentral.bean;
 
-import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
+import java.util.List;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.List;
+
+import cn.com.qmth.scancentral.enums.ExamMode;
 
 public class ExamConfigDomain {
 
@@ -35,9 +35,6 @@ public class ExamConfigDomain {
     @NotNull(message = "是否允许单页题卡不能为空", groups = ExamConfigInit.class)
     private Boolean enableSinglePageAnswer;
 
-    @NotNull(message = "图片转存规则不能为空", groups = ExamConfigInit.class)
-    private ImageTransferMode imageTransferMode;
-
     private List<String> paperTypeBarcodeContent;
 
     private String absentBarcodeContent;
@@ -98,14 +95,6 @@ public class ExamConfigDomain {
         this.enableSinglePageAnswer = enableSinglePageAnswer;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
-    }
-
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
-    }
-
     public List<String> getPaperTypeBarcodeContent() {
         return paperTypeBarcodeContent;
     }

src/main/java/cn/com/qmth/scancentral/bean/ImportExamDomain.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.bean;
 
-import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
-
 import java.util.List;
 
+import cn.com.qmth.scancentral.enums.ExamMode;
+
 public class ImportExamDomain {
 
     private Long id;
@@ -25,8 +24,6 @@ public class ImportExamDomain {
 
     private Boolean enableSinglePageAnswer;
 
-    private ImageTransferMode imageTransferMode;
-
     private List<String> paperTypeBarcodeContent;
 
     private String absentBarcodeContent;
@@ -89,14 +86,6 @@ public class ImportExamDomain {
         this.enableSinglePageAnswer = enableSinglePageAnswer;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
-    }
-
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
-    }
-
     public List<String> getPaperTypeBarcodeContent() {
         return paperTypeBarcodeContent;
     }

src/main/java/cn/com/qmth/scancentral/entity/ExamEntity.java

@@ -1,12 +1,16 @@
 package cn.com.qmth.scancentral.entity;
 
-import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
-import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
-import com.baomidou.mybatisplus.annotation.*;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 
-import java.util.List;
+import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
+import cn.com.qmth.scancentral.enums.ExamMode;
 
 // 考试
 @TableName(value = "sc_exam", autoResultMap = true)
@@ -31,8 +35,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
 
     private Boolean enableSinglePageAnswer;
 
-    private ImageTransferMode imageTransferMode;
-
     private Boolean enableUpload;
 
     private Boolean enableSyncVerify;
@@ -146,14 +148,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
         this.enableUpload = enableUpload;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
-    }
-
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
-    }
-
     public Boolean getEnableSyncVerify() {
         return enableSyncVerify;
     }

src/main/java/cn/com/qmth/scancentral/enums/ImageTransferMode.java

@@ -1,32 +0,0 @@
-package cn.com.qmth.scancentral.enums;
-
-public enum ImageTransferMode {
-
-    OFF("OFF"),
-
-    CET("CET"),
-
-    OW("OW"),
-
-    ;
-
-    private String name;
-
-    ImageTransferMode(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static ImageTransferMode getByName(String name) {
-        for (ImageTransferMode r : ImageTransferMode.values()) {
-            if (r.getName().equals(name)) {
-                return r;
-            }
-        }
-        return null;
-    }
-
-}

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

@@ -11,7 +11,6 @@ import cn.com.qmth.scancentral.vo.task.TaskStatusVo;
 import cn.com.qmth.scancentral.vo.task.TaskVo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
-import java.util.Collection;
 import java.util.List;
 
 public interface OmrTaskService extends IService<OmrTaskEntity> {

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

@@ -1,13 +1,13 @@
 package cn.com.qmth.scancentral.service;
 
 import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
+import cn.com.qmth.scancentral.enums.ExamMode;
 
 public interface ToolExportService {
 
     void studentCheck(Long studentId);
 
-    void studentFileCopy(Long studentId, ImageTransferMode imageTransferMode);
+    void studentFileCopy(Long studentId, ExamMode examMode);
 
     String getCetSliceUri(Long examId, String examNumber, String sliceName);
 

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

@@ -782,7 +782,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
     @Override
     public IPage<BatchEntity> findUnCheck(Long examId, int pageNumber, int pageSize, BatchStatus batchStatus,
             CheckStatus checkStatus, String order) {
-        Page page = new Page<>(pageNumber, pageSize);
+        Page<BatchEntity> page = new Page<>(pageNumber, pageSize);
         if ("ASC".equalsIgnoreCase(order)) {
             page.addOrder(OrderItem.asc("id"));
         } else {

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

@@ -2,7 +2,6 @@ package cn.com.qmth.scancentral.service.impl;
 
 import java.util.List;
 
-import cn.com.qmth.scancentral.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,12 +28,21 @@ import cn.com.qmth.scancentral.entity.SubjectEntity;
 import cn.com.qmth.scancentral.enums.CheckStatus;
 import cn.com.qmth.scancentral.enums.ExamMode;
 import cn.com.qmth.scancentral.enums.ExamStatus;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
 import cn.com.qmth.scancentral.enums.OP;
 import cn.com.qmth.scancentral.enums.Role;
 import cn.com.qmth.scancentral.enums.TaskStatus;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.util.JsonMapper;
+import cn.com.qmth.scancentral.service.AnswerCardService;
+import cn.com.qmth.scancentral.service.BatchService;
+import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.ExamSummaryService;
+import cn.com.qmth.scancentral.service.MarkSiteService;
+import cn.com.qmth.scancentral.service.OmrGroupService;
+import cn.com.qmth.scancentral.service.OmrTaskService;
+import cn.com.qmth.scancentral.service.PackageCardService;
+import cn.com.qmth.scancentral.service.PackageTaskService;
+import cn.com.qmth.scancentral.service.StudentService;
+import cn.com.qmth.scancentral.service.SubjectService;
 import cn.com.qmth.scancentral.util.MathUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
 import cn.com.qmth.scancentral.vo.ExamConfigVo;
@@ -143,7 +151,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         examEntity.setEnableSinglePageAnswer(false);
         examEntity.setEnableUpload(false);
         examEntity.setEnableSyncVerify(true);
-        examEntity.setImageTransferMode(ImageTransferMode.CET);
         examEntity.setImageCheckRatio(0.05);
         examEntity.setExamNumberFillCount(10);
         examEntity.setImageCheckOrder("ASC");
@@ -197,7 +204,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         vo.getScan().setImageCheckCount(imageCheckCount);
         vo.getScan().setImageCheckTodoCount(imageCheckTodoCount);
 
-        if (!exam.getEnableSyncVerify()){
+        if (!exam.getEnableSyncVerify()) {
             int auditorTodoCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.EQ);
             int auditorFinishCount = studentService.getCountByExamAndAssignedCheckCount(examId, null, 0, OP.GT);
             int auditorTotalCount = auditorTodoCount + auditorFinishCount;
@@ -205,7 +212,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
             vo.getAssignedCheck().setAuditorTodoCount(auditorTodoCount);
             vo.getAssignedCheck().setAuditorFinishCount(auditorFinishCount);
             vo.getAssignedCheck().setAuditorFinishRate(auditorFinishRate);
-        }else{
+        } else {
             vo.getAssignedCheck().setAuditorTodoCount(0);
             vo.getAssignedCheck().setAuditorFinishCount(0);
             vo.getAssignedCheck().setAuditorFinishRate(0);
@@ -257,7 +264,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
 
         vo.getExamConfig().setAllowUnexistPaper(exam.getAllowUnexistPaper());
         vo.getExamConfig().setAnswerFrontCardType(exam.getAnswerFrontCardType());
-        vo.getExamConfig().setImageTransferMode(exam.getImageTransferMode());
         vo.getExamConfig().setEnableSinglePageAnswer(exam.getEnableSinglePageAnswer());
         vo.getExamConfig().setMode(exam.getMode());
         vo.getExamConfig().setScanByPackage(exam.getScanByPackage());
@@ -344,9 +350,8 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         updateWrapper.eq(ExamEntity::getId, config.getExamId());
         this.update(updateWrapper);
 
-
-        if (config.getPaperTypeBarcodeContent() != null &&!config.getPaperTypeBarcodeContent().isEmpty()) {
-            markSiteService.saveByExamIdAndSubjectCode(config.getExamId(),config.getPaperTypeBarcodeContent());
+        if (config.getPaperTypeBarcodeContent() != null && !config.getPaperTypeBarcodeContent().isEmpty()) {
+            markSiteService.saveByExamIdAndSubjectCode(config.getExamId(), config.getPaperTypeBarcodeContent());
         }
 
         if (config.getEnableSyncVerify() != null && !config.getEnableSyncVerify()) {
@@ -419,10 +424,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         if (domain.getAnswerFrontCardType() == null) {
             throw new ParameterException("AnswerFrontCardType 不能为空");
         }
-        if (domain.getImageTransferMode() == null) {
-            domain.setImageTransferMode(ImageTransferMode.OFF);
-            // throw new ParameterException("ImageTransferMode 不能为空");
-        }
         if (domain.getMode() == null) {
             throw new ParameterException("ExamMode 不能为空");
         }
@@ -444,7 +445,6 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         exam.setScanByPackage(domain.getScanByPackage());
         exam.setAbsentBarcodeContent(domain.getAbsentBarcodeContent());
         exam.setAnswerFrontCardType(domain.getAnswerFrontCardType());
-        exam.setImageTransferMode(domain.getImageTransferMode());
         exam.setMode(domain.getMode());
         exam.setPaperTypeBarcodeContent(domain.getPaperTypeBarcodeContent());
         if (getById(domain.getId()) == null) {

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

@@ -1607,7 +1607,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         StudentEntity se = this.getById(vo.getId());
         try {
             if (UploadStatus.WAITING_UPLOAD.equals(se.getFileUploadStatus())) {
-                toolExportService.studentFileCopy(se.getId(), vo.getImageTransferMode());
+                toolExportService.studentFileCopy(se.getId(), vo.getExamMode());
                 this.updateFileUploadStatus(se.getId(), UploadStatus.UPLOADED);
             }
         } catch (Exception e) {
@@ -1653,26 +1653,26 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         if (ScanStatus.UNEXIST.equals(student.getStatus())) {
             student.setExamStatus(null);
         } else {
-            //客观题有作答，不缺考
-            if(student.getQuestionFilled()){
+            // 客观题有作答，不缺考
+            if (student.getQuestionFilled()) {
                 student.setExamStatus(ExamStatus.OK);
-            }else {
+            } else {
                 if (student.getSubjectiveFilled()) {
-                    //客观题未作答，主观题有作答，待确认1
+                    // 客观题未作答，主观题有作答，待确认1
                     student.setExamStatus(ExamStatus.UNCHECK1);
                 } else {
-                    //客观题未作答，主观题未作答，填涂大于10位
+                    // 客观题未作答，主观题未作答，填涂大于10位
                     if (omrExamNumberCount >= examNumberFillCount) {
-                        if (! "#".equals(student.getPaperType())) {
-                            //客观题未作答，主观题未作答，填涂大于10位，有卷型，待校验2
+                        if (!"#".equals(student.getPaperType())) {
+                            // 客观题未作答，主观题未作答，填涂大于10位，有卷型，待校验2
                             student.setExamStatus(ExamStatus.UNCHECK2);
-                        }else {
-                            //客观题未作答，主观题未作答，填涂大于10位，无卷型，缺考
+                        } else {
+                            // 客观题未作答，主观题未作答，填涂大于10位，无卷型，缺考
                             student.setExamStatus(ExamStatus.ABSENT);
                         }
                     } else {
-                        //客观题未作答，主观题未作答，填涂小于10位，缺考
-                            student.setExamStatus(ExamStatus.ABSENT);
+                        // 客观题未作答，主观题未作答，填涂小于10位，缺考
+                        student.setExamStatus(ExamStatus.ABSENT);
                     }
                 }
             }

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

@@ -1,13 +1,23 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import cn.com.qmth.scancentral.config.SysProperty;
-import cn.com.qmth.scancentral.entity.*;
-import cn.com.qmth.scancentral.enums.*;
-import cn.com.qmth.scancentral.service.*;
-import com.qmth.boot.core.concurrent.service.ConcurrentService;
-import com.qmth.boot.core.exception.ParameterException;
-import com.qmth.boot.core.exception.StatusException;
-import com.qmth.boot.core.fss.store.FileStore;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -16,18 +26,28 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriteParam;
-import javax.imageio.ImageWriter;
-import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.util.List;
-import java.util.*;
+import com.qmth.boot.core.concurrent.service.ConcurrentService;
+import com.qmth.boot.core.exception.ParameterException;
+import com.qmth.boot.core.exception.StatusException;
+import com.qmth.boot.core.fss.store.FileStore;
+
+import cn.com.qmth.scancentral.config.SysProperty;
+import cn.com.qmth.scancentral.entity.AnswerCardEntity;
+import cn.com.qmth.scancentral.entity.ExamEntity;
+import cn.com.qmth.scancentral.entity.PaperPageEntity;
+import cn.com.qmth.scancentral.entity.StudentEntity;
+import cn.com.qmth.scancentral.entity.StudentPaperEntity;
+import cn.com.qmth.scancentral.enums.ExamMode;
+import cn.com.qmth.scancentral.enums.ImageCheckStatus;
+import cn.com.qmth.scancentral.enums.LockType;
+import cn.com.qmth.scancentral.enums.ScanStatus;
+import cn.com.qmth.scancentral.enums.UploadStatus;
+import cn.com.qmth.scancentral.service.AnswerCardService;
+import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.PaperPageService;
+import cn.com.qmth.scancentral.service.StudentPaperService;
+import cn.com.qmth.scancentral.service.StudentService;
+import cn.com.qmth.scancentral.service.ToolExportService;
 
 @Service
 public class ToolExportServiceImpl implements ToolExportService {
@@ -184,14 +204,7 @@ public class ToolExportServiceImpl implements ToolExportService {
     }
 
     @Override
-    public void studentFileCopy(Long studentId, ImageTransferMode imageTransferMode) {
-        // SystemConfigEntity config = systemConfigService.find();
-        // if (config == null) {
-        // throw new StatusException("未找到系统配置");
-        // }
-        // if (!SystemMode.STANDALONE.equals(SystemMode.current())) {
-        // throw new StatusException("系统配置非独立模式");
-        // }
+    public void studentFileCopy(Long studentId, ExamMode examMode) {
         StudentEntity student = studentService.getById(studentId);
         if (student == null) {
             throw new StatusException("未找到考生");
@@ -203,15 +216,13 @@ public class ToolExportServiceImpl implements ToolExportService {
             throw new StatusException("考生扫描结果缺页");
         }
         ExamEntity exam = examService.getById(student.getExamId());
-        if (exam.getImageTransferMode().equals(ImageTransferMode.OFF)) {
-            return;
-        }
-        if (ImageTransferMode.CET.equals(exam.getImageTransferMode())) {
+        if (ExamMode.CET.equals(exam.getMode())) {
             studentFileCopyCet(student);
-        } else if (ImageTransferMode.OW.equals(exam.getImageTransferMode())) {
-            studentFileCopyOw(student);
+            // } else if
+            // (ImageTransferMode.OW.equals(exam.getImageTransferMode())) {
+            // studentFileCopyOw(student);
         } else {
-            throw new StatusException("转存模式配置错误");
+            throw new StatusException("模式配置错误");
         }
     }
 
@@ -278,6 +289,7 @@ public class ToolExportServiceImpl implements ToolExportService {
         }
     }
 
+    @SuppressWarnings("unused")
     private void studentFileCopyOw(StudentEntity student) {
         List<StudentPaperEntity> spes = studentPaperService.findByStudentId(student.getId());
         if (CollectionUtils.isEmpty(spes)) {

src/main/java/cn/com/qmth/scancentral/task/ImageCheckJob.java

@@ -1,16 +1,18 @@
 package cn.com.qmth.scancentral.task;
 
-import cn.com.qmth.scancentral.entity.ExamEntity;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.ImageCheckService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+
+import cn.com.qmth.scancentral.entity.ExamEntity;
+import cn.com.qmth.scancentral.enums.ExamMode;
+import cn.com.qmth.scancentral.service.ExamService;
+import cn.com.qmth.scancentral.service.ImageCheckService;
 
 @Service
 public class ImageCheckJob {
@@ -24,12 +26,12 @@ public class ImageCheckJob {
     @Scheduled(fixedDelay = 60000, initialDelay = 30000)
     public void process() {
         LambdaQueryWrapper<ExamEntity> wrapper = Wrappers.lambdaQuery();
-        wrapper.select(ExamEntity::getId);
+        wrapper.select(ExamEntity::getId, ExamEntity::getId);
         wrapper.eq(ExamEntity::getEnable, true);
         List<ExamEntity> exams = examService.list(wrapper);
 
         for (ExamEntity exam : exams) {
-            if (ImageTransferMode.CET.equals(exam.getImageTransferMode())) {
+            if (ExamMode.CET.equals(exam.getMode())) {
                 imageCheckService.check(exam.getId());
             }
         }

src/main/java/cn/com/qmth/scancentral/vo/StudentUploadVo.java

@@ -1,6 +1,6 @@
 package cn.com.qmth.scancentral.vo;
 
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
+import cn.com.qmth.scancentral.enums.ExamMode;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.enums.UploadStatus;
 
@@ -47,7 +47,7 @@ public class StudentUploadVo {
 
     private UploadStatus dataUploadStatus;
 
-    private ImageTransferMode imageTransferMode;
+    private ExamMode examMode;
 
     public Long getId() {
         return id;
@@ -201,12 +201,12 @@ public class StudentUploadVo {
         this.dataUploadStatus = dataUploadStatus;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
+    public ExamMode getExamMode() {
+        return examMode;
     }
 
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
+    public void setExamMode(ExamMode examMode) {
+        this.examMode = examMode;
     }
 
 }

src/main/java/cn/com/qmth/scancentral/vo/SubjectConfigVo.java

@@ -2,15 +2,13 @@ package cn.com.qmth.scancentral.vo;
 
 import java.util.List;
 
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-
 public class SubjectConfigVo {
 
     private List<String> paperTypeBarcodeContent;
 
     private String code;
 
-//    private String name;
+    // private String name;
 
     public SubjectConfigVo() {
     }
@@ -31,11 +29,11 @@ public class SubjectConfigVo {
         this.code = code;
     }
 
-//    public String getName() {
-//        return name;
-//    }
-//
-//    public void setName(String name) {
-//        this.name = name;
-//    }
+    // public String getName() {
+    // return name;
+    // }
+    //
+    // public void setName(String name) {
+    // this.name = name;
+    // }
 }

src/main/java/cn/com/qmth/scancentral/vo/examinfo/ExamConfig.java

@@ -1,10 +1,9 @@
 package cn.com.qmth.scancentral.vo.examinfo;
 
+import java.util.List;
+
 import cn.com.qmth.scancentral.entity.ExamEntity;
 import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
-
-import java.util.List;
 
 public class ExamConfig {
 
@@ -18,8 +17,6 @@ public class ExamConfig {
 
     private Boolean enableSinglePageAnswer;
 
-    private ImageTransferMode imageTransferMode;
-
     private Boolean enableSyncVerify;
 
     private List<String> paperTypeBarcodeContent;
@@ -38,7 +35,6 @@ public class ExamConfig {
         this.enableSinglePageAnswer = exam.getEnableSinglePageAnswer();
         this.mode = exam.getMode();
         this.paperTypeBarcodeContent = exam.getPaperTypeBarcodeContent();
-        this.imageTransferMode = exam.getImageTransferMode();
         this.scanByPackage = exam.getScanByPackage();
     }
 
@@ -82,14 +78,6 @@ public class ExamConfig {
         this.enableSinglePageAnswer = enableSinglePageAnswer;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
-    }
-
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
-    }
-
     public Boolean getEnableSyncVerify() {
         return enableSyncVerify;
     }

src/main/java/cn/com/qmth/scancentral/vo/scanexaminfo/Config.java

@@ -3,7 +3,6 @@ package cn.com.qmth.scancentral.vo.scanexaminfo;
 import java.util.List;
 
 import cn.com.qmth.scancentral.enums.ExamMode;
-import cn.com.qmth.scancentral.enums.ImageTransferMode;
 
 public class Config {
 
@@ -17,8 +16,6 @@ public class Config {
 
     private Boolean enableSinglePageAnswer;
 
-    private ImageTransferMode imageTransferMode;
-
     private Boolean enableSyncVerify;
 
     private List<String> paperTypeBarcodeContent;
@@ -67,14 +64,6 @@ public class Config {
         this.enableSinglePageAnswer = enableSinglePageAnswer;
     }
 
-    public ImageTransferMode getImageTransferMode() {
-        return imageTransferMode;
-    }
-
-    public void setImageTransferMode(ImageTransferMode imageTransferMode) {
-        this.imageTransferMode = imageTransferMode;
-    }
-
     public Boolean getEnableSyncVerify() {
         return enableSyncVerify;
     }

src/main/resources/mapper/StudentMapper.xml

@@ -352,11 +352,11 @@
     <select id="findToPictureCopy"
             resultType="cn.com.qmth.scancentral.vo.StudentUploadVo">
         select t.*,
-               e.image_transfer_mode
+               e.exam_mode
         from sc_student t
                  inner join sc_exam e on t.exam_id = e.id
         where e.enable = 1
-          and (e.image_transfer_mode = 'OW' or e.image_transfer_mode = 'CET')
+          and e.exam_mode = 'CET'
           and t.file_upload_status = 'WAITING_UPLOAD'
             limit #{pageSize}
     </select>