省份

install/mysql/init/scan_central_db.sql

@@ -12,6 +12,7 @@ CREATE TABLE IF NOT EXISTS `sc_student`
     `seat_number`          varchar(16) DEFAULT NULL,
     `campus_name`          varchar(64) DEFAULT NULL,
     `campus_code`          varchar(64) DEFAULT NULL,
+    `province`				varchar(64) DEFAULT NULL,
     `status`               varchar(16) NOT NULL,
     `omr_absent`           bit(1)      NOT NULL,
     `question_filled`      bit(1)      NOT NULL,

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

@@ -26,6 +26,8 @@ public class ImportStudentDomain {
 
     private String campusCode;
 
+    private String province;
+
     public Long getExamId() {
         return examId;
     }
@@ -122,4 +124,12 @@ public class ImportStudentDomain {
         this.campusCode = campusCode;
     }
 
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
 }

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

@@ -41,6 +41,10 @@ public class StudentEntity extends AuditingWithoutIdEntity {
 
     private String campusCode;
 
+    // 省份
+    private String province;
+
+    // 设备
     private String device;
 
     private ScanStatus status;
@@ -330,4 +334,12 @@ public class StudentEntity extends AuditingWithoutIdEntity {
         this.imageCheckStatus = imageCheckStatus;
     }
 
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
 }

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

@@ -180,9 +180,11 @@ public class StudentImportServiceImpl implements StudentImportService {
 
             long cost = (System.currentTimeMillis() - startTime) / 1000L;
             log.info("已导入:{}条 已耗时:{}秒 进度:100% taskId:{}", finishCount, cost, taskId);
-            this.writeLogFile(logFile, String.format("本次解析考生数据共%s条，已导入%s条，未导入%s条！", total, finishCount, total - finishCount));
+            this.writeLogFile(logFile,
+                    String.format("本次解析考生数据共%s条，已导入%s条，未导入%s条！", total, finishCount, total - finishCount));
         } catch (Exception e) {
-            log.error("导入过程异常终止，已导入{}条，未导入{}条！taskId:{} err:{}", finishCount, total - finishCount, taskId, e.getMessage(), e);
+            log.error("导入过程异常终止，已导入{}条，未导入{}条！taskId:{} err:{}", finishCount, total - finishCount, taskId,
+                    e.getMessage(), e);
             this.writeLogFile(logFile, String.format("【错误】导入过程异常终止，已导入%s条，未导入%s条！", finishCount, total - finishCount));
         } finally {
             task.setProgress(100d);
@@ -202,10 +204,12 @@ public class StudentImportServiceImpl implements StudentImportService {
         data.setExamRoom(info.getExamRoom());
         data.setPackageCode(info.getPackageCode());
         data.setSeatNumber(info.getSeatNumber());
+        data.setProvince(info.getProvince());
         return data;
     }
 
-    private List<String> parseValues(List<String> lines, List<StudentImportInfo> list, Long examId, Integer yearConfig, Integer yearHalfConfig) {
+    private List<String> parseValues(List<String> lines, List<StudentImportInfo> list, Long examId, Integer yearConfig,
+            Integer yearHalfConfig) {
         Set<String> subjectCodes = new HashSet<>();
         Set<String> examNumbers = new HashSet<>();
         List<String> errs = new ArrayList<>();
@@ -269,6 +273,7 @@ public class StudentImportServiceImpl implements StudentImportService {
                 continue;
             }
 
+            String province = examNumber.substring(0, 3);
             String subjectCode = examNumber.substring(9, 10);
             String examSite = examNumber.substring(0, 5);
             String campusCode = examNumber.substring(0, 6);
@@ -277,6 +282,7 @@ public class StudentImportServiceImpl implements StudentImportService {
             subjectCodes.add(subjectCode);
 
             StudentImportInfo data = new StudentImportInfo();
+            data.setProvince(province);
             data.setExamId(examId);
             data.setSubjectCode(subjectCode);
             data.setExamNumber(examNumber);

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

@@ -794,6 +794,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             entity.setExamNumber(domain.getExamNumber());
             entity.setPackageCode(domain.getPackageCode());
             entity.setExamRoom(domain.getExamRoom());
+            entity.setProvince(domain.getProvince());
             entity.setExamSite(domain.getExamSite());
             entity.setExamSiteName(domain.getExamSiteName());
             entity.setSeatNumber(domain.getSeatNumber());

src/main/java/cn/com/qmth/scancentral/vo/answerquery/AnswerQueryVo.java

@@ -29,6 +29,8 @@ public class AnswerQueryVo {
 
     private String examRoom;
 
+    private String province;
+
     private String seatNumber;
 
     private ExamStatus examStatus;
@@ -296,4 +298,13 @@ public class AnswerQueryVo {
     public void setAuditorId(Long auditorId) {
         this.auditorId = auditorId;
     }
+
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
 }

src/main/java/cn/com/qmth/scancentral/vo/studentimport/StudentImportInfo.java

@@ -26,6 +26,8 @@ public class StudentImportInfo {
 
     private String seatNumber;// 座位号
 
+    private String province;
+
     public Long getExamId() {
         return examId;
     }
@@ -122,4 +124,12 @@ public class StudentImportInfo {
         this.seatNumber = seatNumber;
     }
 
+    public String getProvince() {
+        return province;
+    }
+
+    public void setProvince(String province) {
+        this.province = province;
+    }
+
 }

src/main/resources/mapper/StudentMapper.xml

@@ -346,7 +346,7 @@
             and t.exam_room=#{query.examRoom}
         </if>
         <if test="query.province != null and query.province !=''">
-            and t.exam_site like concat(#{query.province}, '%')
+            and t.province=#{query.province}
         </if>
         <if test="query.absentSuspect != null">
             and t.absent_suspect=#{query.absentSuspect}