条码取值bug

install/mysql/init/scan_central_db.sql

@@ -88,7 +88,6 @@ CREATE TABLE IF NOT EXISTS `sc_exam`
     `enable_upload`                    bit(1)       NOT NULL,
     `enable_sync_verify`               bit(1)       NOT NULL,
     `exam_number_fill_count`           int         DEFAULT NULL,
-    `paper_type_barcode_content`       text        DEFAULT NULL,
     `absent_barcode_content`           varchar(16) DEFAULT NULL,
     `image_check_ratio`                double      DEFAULT NULL,
     `image_check_order`                varchar(50) DEFAULT NULL,
@@ -433,7 +432,6 @@ CREATE TABLE IF NOT EXISTS `sc_subject`
     `exam_id`                    bigint      NOT NULL,
     `code`                       varchar(64) NOT NULL,
     `name`                       varchar(64) NOT NULL,
-    `paper_type_barcode_content` text   DEFAULT NULL,
     `creator_id`                 bigint DEFAULT NULL,
     `updater_id`                 bigint DEFAULT NULL,
     `create_time`                bigint DEFAULT NULL,

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

@@ -1,13 +1,10 @@
 package cn.com.qmth.scancentral.entity;
 
-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 cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 import cn.com.qmth.scancentral.enums.ExamMode;
@@ -39,10 +36,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
 
     private Boolean enableSyncVerify;
 
-    // 卷型条码内容（JSON字符串）
-    @TableField(value = "paper_type_barcode_content", typeHandler = JacksonTypeHandler.class)
-    private List<String> paperTypeBarcodeContent;
-
     private String absentBarcodeContent;
 
     // 图片抽查比例
@@ -153,14 +146,6 @@ public class ExamEntity extends AuditingWithoutIdEntity {
         this.enableSyncVerify = enableSyncVerify;
     }
 
-    public List<String> getPaperTypeBarcodeContent() {
-        return paperTypeBarcodeContent;
-    }
-
-    public void setPaperTypeBarcodeContent(List<String> paperTypeBarcodeContent) {
-        this.paperTypeBarcodeContent = paperTypeBarcodeContent;
-    }
-
     public String getAbsentBarcodeContent() {
         return absentBarcodeContent;
     }

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

@@ -1,12 +1,9 @@
 package cn.com.qmth.scancentral.entity;
 
-import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 
-import java.util.List;
+import cn.com.qmth.scancentral.entity.base.AuditingWithoutIdEntity;
 
 // 科目
 @TableName(value = "sc_subject", autoResultMap = true)
@@ -25,9 +22,6 @@ public class SubjectEntity extends AuditingWithoutIdEntity {
 
     private String name;
 
-    @TableField(value = "paper_type_barcode_content", typeHandler = JacksonTypeHandler.class)
-    private List<String> paperTypeBarcodeContent;
-
     public SubjectEntity(Long examId, String subjectCode, String subjectName) {
         this.examId = examId;
         this.code = subjectCode;
@@ -61,12 +55,4 @@ public class SubjectEntity extends AuditingWithoutIdEntity {
         this.name = name;
     }
 
-    public List<String> getPaperTypeBarcodeContent() {
-        return paperTypeBarcodeContent;
-    }
-
-    public void setPaperTypeBarcodeContent(List<String> paperTypeBarcodeContent) {
-        this.paperTypeBarcodeContent = paperTypeBarcodeContent;
-    }
-
 }

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

@@ -2,14 +2,11 @@ package cn.com.qmth.scancentral.service;
 
 import java.util.List;
 
-import cn.com.qmth.scancentral.vo.SubjectConfig;
-import cn.com.qmth.scancentral.vo.UpdateTimeVo;
 import com.github.jeffreyning.mybatisplus.service.IMppService;
 
 import cn.com.qmth.scancentral.bean.ImportSubjectDomain;
-import cn.com.qmth.scancentral.bean.SubjectConfigDomain;
-import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.entity.SubjectEntity;
+import cn.com.qmth.scancentral.vo.UpdateTimeVo;
 import cn.com.qmth.scancentral.vo.omr.OmrSubjectVo;
 import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
 import cn.com.qmth.scancentral.vo.subject.ScanProgressVo;
@@ -27,10 +24,6 @@ public interface SubjectService extends IMppService<SubjectEntity> {
 
     int importSubject(List<ImportSubjectDomain> subjects);
 
-    SubjectConfig config(User user, SubjectConfigDomain domain);
-
-    List<cn.com.qmth.scancentral.vo.examinfo.SubjectConfig> listConfigByExamId(Long examId);
-
     ScanProgressVo scanProgress(Long examId, String subjectCode);
 
     List<SubjectBreachVo> breachList(Long examId);

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

@@ -258,7 +258,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         vo.getExamConfig().setScanByPackage(exam.getScanByPackage());
         vo.getExamConfig().setEnableSyncVerify(exam.getEnableSyncVerify());
         vo.getExamConfig().setAbsentBarcodeContent(exam.getAbsentBarcodeContent());
-        vo.getExamConfig().setPaperTypeBarcodeContent(exam.getPaperTypeBarcodeContent());
+        // vo.getExamConfig().setPaperTypeBarcodeContent(exam.getPaperTypeBarcodeContent());
         vo.getExamConfig().setScannerAssignedMaxCount(exam.getScannerAssignedMaxCount());
 
         vo.getAnswerScan().setCardCount(answerCardService.getCountByExam(id));
@@ -344,7 +344,7 @@ public class ExamServiceImpl extends ServiceImpl<ExamDao, ExamEntity> implements
         this.update(updateWrapper);
 
         if (config.getEnableSyncVerify() != null && !config.getEnableSyncVerify()) {
-             batchService.batchVerifyCancel(user, config.getExamId());
+            batchService.batchVerifyCancel(user, config.getExamId());
         }
     }
 

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

@@ -34,11 +34,25 @@ import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.bean.papermigrate.PaperMigrateDomain;
 import cn.com.qmth.scancentral.bean.papermigrate.PaperMigratePage;
 import cn.com.qmth.scancentral.dao.PaperDao;
-import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.entity.AnswerCardEntity;
+import cn.com.qmth.scancentral.entity.BatchPaperEntity;
+import cn.com.qmth.scancentral.entity.PaperEntity;
+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.ImageCheckStatus;
 import cn.com.qmth.scancentral.enums.LockType;
 import cn.com.qmth.scancentral.enums.UploadStatus;
-import cn.com.qmth.scancentral.service.*;
+import cn.com.qmth.scancentral.service.AnswerCardService;
+import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
+import cn.com.qmth.scancentral.service.BatchPaperService;
+import cn.com.qmth.scancentral.service.FilePropertyService;
+import cn.com.qmth.scancentral.service.FileService;
+import cn.com.qmth.scancentral.service.MarkSiteService;
+import cn.com.qmth.scancentral.service.PaperPageService;
+import cn.com.qmth.scancentral.service.PaperService;
+import cn.com.qmth.scancentral.service.StudentPaperService;
+import cn.com.qmth.scancentral.service.StudentService;
 import cn.com.qmth.scancentral.util.PageUtil;
 import cn.com.qmth.scancentral.vo.MismatchToggleVo;
 import cn.com.qmth.scancentral.vo.PaperMigrateVo;
@@ -54,9 +68,6 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
 
     protected static Logger log = LoggerFactory.getLogger(PaperServiceImpl.class);
 
-    @Autowired
-    private ExamService examService;
-
     @Autowired
     private StudentPaperService studentPaperService;
 
@@ -69,6 +80,9 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
     @Autowired
     private StudentService studentService;
 
+    @Autowired
+    private MarkSiteService markSiteService;
+
     @Autowired
     private ConcurrentService concurrentService;
 
@@ -84,9 +98,6 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
     @Autowired
     private PaperPageService paperPageService;
 
-    @Autowired
-    private SubjectService subjectService;
-
     @Autowired
     private AnswerCardSubjectService answerCardSubjectService;
 
@@ -294,7 +305,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
                 && CollectionUtils.isEmpty(domain.getPages())) {
             throw new ParameterException("卡格式有变化需要重新识别, pages信息不能为空");
         }
-        ExamEntity exam = examService.getById(paper.getExamId());
+        // ExamEntity exam = examService.getById(paper.getExamId());
         // 指定paper现有绑定考生
         StudentEntity previousStudent = null;
         StudentPaperEntity previousStudentPaper = studentPaperService.findByPaperId(domain.getPaperId());
@@ -339,12 +350,8 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
             paper.setUpdaterId(user.getId());
             paper.setUpdateTime(System.currentTimeMillis());
             if (CollectionUtils.isNotEmpty(domain.getPages())) {
-                List<String> paperTypeBarcodeContents = exam.getPaperTypeBarcodeContent();
-                SubjectEntity subject = subjectService.findByExamIdAndCode(student.getExamId(),
-                        student.getSubjectCode());
-                if (subject.getPaperTypeBarcodeContent() != null && !subject.getPaperTypeBarcodeContent().isEmpty()) {
-                    paperTypeBarcodeContents = subject.getPaperTypeBarcodeContent();
-                }
+                List<String> paperTypeBarcodeContents = markSiteService
+                        .findPaperTypeBarcodeContentByExamAndSubjectCode(student.getExamId(), student.getSubjectCode());
                 // 重新识别时更新所有page
                 List<PaperPageEntity> pages = new ArrayList<>();
                 for (PaperMigratePage page : domain.getPages()) {

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

@@ -293,9 +293,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                 PaperPageEntity page = paperPageService.findPaperIdAndIndex(paper.getId(), 1);
                 List<String> paperTypeBarcodeContents = markSiteService
                         .findPaperTypeBarcodeContentByExamAndSubjectCode(student.getExamId(), student.getSubjectCode());
-                if (paperTypeBarcodeContents == null || paperTypeBarcodeContents.isEmpty()) {
-                    paperTypeBarcodeContents = exam.getPaperTypeBarcodeContent();
-                }
                 if (page.getPaperType() == null || page.getPaperType().getResult().length() == 0
                         || page.getPaperType().getResult().equals("#")) {
                     student.setPaperType("#");
@@ -1119,12 +1116,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         // if (domain.getPapers().size() != answerCard.getPaperCount()) {
         // throw new ParameterException("卡格式张数不一致");
         // }
-        ExamEntity exam = examService.getById(student.getExamId());
-        List<String> paperTypeBarcodeContents = exam.getPaperTypeBarcodeContent();
-        SubjectEntity subject = subjectService.findByExamIdAndCode(student.getExamId(), student.getSubjectCode());
-        if (subject.getPaperTypeBarcodeContent() != null && !subject.getPaperTypeBarcodeContent().isEmpty()) {
-            paperTypeBarcodeContents = subject.getPaperTypeBarcodeContent();
-        }
+        List<String> paperTypeBarcodeContents = markSiteService
+                .findPaperTypeBarcodeContentByExamAndSubjectCode(student.getExamId(), student.getSubjectCode());
         concurrentService.getReadWriteLock(LockType.STUDENT + "-" + student.getId()).writeLock().lock();
         try {
             List<StudentPaperEntity> studentPaperList = studentPaperService.findByStudentId(student.getId());
@@ -1285,8 +1278,10 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         if (exam == null) {
             throw new ParameterException("未找到考试");
         }
-        if (CollectionUtils.isEmpty(exam.getPaperTypeBarcodeContent())) {
-            throw new ParameterException("该考试条码值未设置");
+        List<String> paperTypeBarcodeContents = markSiteService
+                .findPaperTypeBarcodeContentByExamAndSubjectCode(query.getExamId(), query.getSubjectCode());
+        if (CollectionUtils.isEmpty(paperTypeBarcodeContents)) {
+            throw new ParameterException("该科目条码值未设置");
         }
         if (!ExamMode.CET.equals(exam.getMode())) {
             throw new ParameterException("该考试不是CET");
@@ -1307,8 +1302,8 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                     Map<Long, List<PaperPageCetVo>> totalpagesmap = ofPage(totalpages);
                     Map<Long, List<PaperCetVo>> totalpapersmap = ofPaper(totalpapers);
                     for (ExportCetVo vo : dataList) {
-                        disposeStudent(vo, exam, totalpagesmap.get(vo.getId()), totalpapersmap.get(vo.getId()),
-                                imageTransferDir, structs, cardMap);
+                        disposeStudent(vo, paperTypeBarcodeContents, totalpagesmap.get(vo.getId()),
+                                totalpapersmap.get(vo.getId()), imageTransferDir, structs, cardMap);
                     }
 
                 }
@@ -1317,11 +1312,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         return iPage.getRecords();
     }
 
-    private void disposeStudent(ExportCetVo student, ExamEntity exam, List<PaperPageCetVo> pages,
+    private void disposeStudent(ExportCetVo student, List<String> paperTypeBarcodeContents, List<PaperPageCetVo> pages,
             List<PaperCetVo> papers, String imageTransferDir, Map<String, List<QuestionEntity>> structs,
             Map<Integer, AnswerCardEntity> cardMap) {
-        int subject = Integer.valueOf(student.getSubjectCode());
-        if (subject > 2) {
+        int subjectCodeVal = Integer.valueOf(student.getSubjectCode());
+        if (subjectCodeVal > 2) {
             if (student.getExamStatus().equals(ExamStatus.ABSENT)) {
                 student.setPaperType("000000");
             } else {
@@ -1331,7 +1326,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             if (StringUtils.isBlank(student.getPaperType()) || "#".equals(student.getPaperType())) {
                 student.setPaperType("000000");
             } else if ("?".equals(student.getPaperType())
-                    || !exam.getPaperTypeBarcodeContent().contains(student.getPaperType())) {
+                    || !paperTypeBarcodeContents.contains(student.getPaperType())) {
                 student.setPaperType("999999");
             }
         }

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

@@ -18,8 +18,6 @@ import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import cn.com.qmth.scancentral.enums.ScanStatus;
-import cn.com.qmth.scancentral.vo.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -41,8 +39,6 @@ import com.qmth.boot.core.fss.store.FileStore;
 import com.qmth.boot.tools.uuid.FastUUID;
 
 import cn.com.qmth.scancentral.bean.ImportSubjectDomain;
-import cn.com.qmth.scancentral.bean.SubjectConfigDomain;
-import cn.com.qmth.scancentral.bean.User;
 import cn.com.qmth.scancentral.consumer.AnswerDataExportConsumer;
 import cn.com.qmth.scancentral.consumer.SliceDataExportConsumer;
 import cn.com.qmth.scancentral.dao.SubjectDao;
@@ -51,6 +47,7 @@ import cn.com.qmth.scancentral.entity.MarkSiteEntity;
 import cn.com.qmth.scancentral.entity.SubjectEntity;
 import cn.com.qmth.scancentral.enums.AsyncTaskStatus;
 import cn.com.qmth.scancentral.enums.ExamStatus;
+import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.service.AsyncTaskService;
 import cn.com.qmth.scancentral.service.BatchPaperService;
 import cn.com.qmth.scancentral.service.ExamService;
@@ -63,6 +60,10 @@ import cn.com.qmth.scancentral.support.SpringContextHolder;
 import cn.com.qmth.scancentral.util.Calculator;
 import cn.com.qmth.scancentral.util.DateUtil;
 import cn.com.qmth.scancentral.util.FileUtil;
+import cn.com.qmth.scancentral.vo.ExportCetMarkingQueryVo;
+import cn.com.qmth.scancentral.vo.ExportCetVo;
+import cn.com.qmth.scancentral.vo.OmrGroupVo;
+import cn.com.qmth.scancentral.vo.UpdateTimeVo;
 import cn.com.qmth.scancentral.vo.omr.OmrSubjectVo;
 import cn.com.qmth.scancentral.vo.subject.DataExportTaskVo;
 import cn.com.qmth.scancentral.vo.subject.ScanProgressVo;
@@ -180,31 +181,6 @@ public class SubjectServiceImpl extends MppServiceImpl<SubjectDao, SubjectEntity
         return saveList.size();
     }
 
-    @Transactional
-    @Override
-    public SubjectConfig config(User user, SubjectConfigDomain domain) {
-        SubjectEntity s = this.findByExamIdAndCode(domain.getExamId(), domain.getSubjectCode());
-        if (s == null) {
-            throw new ParameterException("找不到对应的科目");
-        }
-        s.setPaperTypeBarcodeContent(domain.getPaperTypeBarcodeContent());
-        this.saveOrUpdateByMultiId(s);
-        return new SubjectConfig(s);
-    }
-
-    @Override
-    public List<cn.com.qmth.scancentral.vo.examinfo.SubjectConfig> listConfigByExamId(Long examId) {
-        QueryWrapper<SubjectEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(SubjectEntity::getExamId, examId);
-        queryWrapper.lambda().isNotNull(SubjectEntity::getPaperTypeBarcodeContent);
-        List<SubjectEntity> list = this.list(queryWrapper);
-        List<cn.com.qmth.scancentral.vo.examinfo.SubjectConfig> result = new ArrayList<cn.com.qmth.scancentral.vo.examinfo.SubjectConfig>();
-        for (SubjectEntity subjectEntity : list) {
-            result.add(new cn.com.qmth.scancentral.vo.examinfo.SubjectConfig(subjectEntity));
-        }
-        return result;
-    }
-
     @Override
     public ScanProgressVo scanProgress(Long examId, String subjectCode) {
         ScanProgressVo ret = new ScanProgressVo();

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

@@ -1,37 +0,0 @@
-package cn.com.qmth.scancentral.vo;
-
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-
-import java.util.List;
-
-public class SubjectConfig {
-
-    private List<String> paperTypeBarcodeContent;
-
-    private Long updateTime;
-
-    public SubjectConfig(SubjectEntity s) {
-        this.paperTypeBarcodeContent = s.getPaperTypeBarcodeContent();
-        this.updateTime = s.getUpdateTime();
-    }
-
-    public SubjectConfig() {
-    }
-
-    public List<String> getPaperTypeBarcodeContent() {
-        return paperTypeBarcodeContent;
-    }
-
-    public void setPaperTypeBarcodeContent(List<String> paperTypeBarcodeContent) {
-        this.paperTypeBarcodeContent = paperTypeBarcodeContent;
-    }
-
-    public Long getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Long updateTime) {
-        this.updateTime = updateTime;
-    }
-
-}

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

@@ -1,7 +1,5 @@
 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;
 
@@ -19,7 +17,7 @@ public class ExamConfig {
 
     private Boolean enableSyncVerify;
 
-    private List<String> paperTypeBarcodeContent;
+    // private List<String> paperTypeBarcodeContent;
 
     private String absentBarcodeContent;
 
@@ -34,7 +32,7 @@ public class ExamConfig {
         this.enableSyncVerify = exam.getEnableSyncVerify();
         this.enableSinglePageAnswer = exam.getEnableSinglePageAnswer();
         this.mode = exam.getMode();
-        this.paperTypeBarcodeContent = exam.getPaperTypeBarcodeContent();
+        // this.paperTypeBarcodeContent = exam.getPaperTypeBarcodeContent();
         this.scanByPackage = exam.getScanByPackage();
     }
 
@@ -86,13 +84,14 @@ public class ExamConfig {
         this.enableSyncVerify = enableSyncVerify;
     }
 
-    public List<String> getPaperTypeBarcodeContent() {
-        return paperTypeBarcodeContent;
-    }
-
-    public void setPaperTypeBarcodeContent(List<String> paperTypeBarcodeContent) {
-        this.paperTypeBarcodeContent = paperTypeBarcodeContent;
-    }
+    // public List<String> getPaperTypeBarcodeContent() {
+    // return paperTypeBarcodeContent;
+    // }
+    //
+    // public void setPaperTypeBarcodeContent(List<String>
+    // paperTypeBarcodeContent) {
+    // this.paperTypeBarcodeContent = paperTypeBarcodeContent;
+    // }
 
     public String getAbsentBarcodeContent() {
         return absentBarcodeContent;

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

@@ -1,7 +1,5 @@
 package cn.com.qmth.scancentral.vo.examinfo;
 
-import cn.com.qmth.scancentral.entity.SubjectEntity;
-
 import java.util.List;
 
 public class SubjectConfig {
@@ -10,11 +8,6 @@ public class SubjectConfig {
 
     private String subjectCode;
 
-    public SubjectConfig(SubjectEntity subjectEntity) {
-        this.subjectCode = subjectEntity.getCode();
-        this.paperTypeBarcodeContent = subjectEntity.getPaperTypeBarcodeContent();
-    }
-
     public List<String> getPaperTypeBarcodeContent() {
         return paperTypeBarcodeContent;
     }

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

@@ -1,7 +1,5 @@
 package cn.com.qmth.scancentral.vo.scanexaminfo;
 
-import java.util.List;
-
 import cn.com.qmth.scancentral.enums.ExamMode;
 
 public class Config {
@@ -18,7 +16,7 @@ public class Config {
 
     private Boolean enableSyncVerify;
 
-    private List<String> paperTypeBarcodeContent;
+    // private List<String> paperTypeBarcodeContent;
 
     private String absentBarcodeContent;
 
@@ -72,13 +70,14 @@ public class Config {
         this.enableSyncVerify = enableSyncVerify;
     }
 
-    public List<String> getPaperTypeBarcodeContent() {
-        return paperTypeBarcodeContent;
-    }
-
-    public void setPaperTypeBarcodeContent(List<String> paperTypeBarcodeContent) {
-        this.paperTypeBarcodeContent = paperTypeBarcodeContent;
-    }
+    // public List<String> getPaperTypeBarcodeContent() {
+    // return paperTypeBarcodeContent;
+    // }
+    //
+    // public void setPaperTypeBarcodeContent(List<String>
+    // paperTypeBarcodeContent) {
+    // this.paperTypeBarcodeContent = paperTypeBarcodeContent;
+    // }
 
     public String getAbsentBarcodeContent() {
         return absentBarcodeContent;