全局修改studentCode为ExamNumber

install/mysql/init/scan_central_db.sql

@@ -3,7 +3,6 @@ CREATE TABLE IF NOT EXISTS `sc_student`
     `id`                 bigint      NOT NULL AUTO_INCREMENT,
     `exam_id`            bigint      NOT NULL,
     `exam_number`        varchar(64) NOT NULL,
-    `student_code`       varchar(64) NOT NULL,
     `name`               varchar(64) NOT NULL,
     `subject_code`       varchar(64) NOT NULL,
     `package_code`       varchar(64) DEFAULT NULL,
@@ -35,8 +34,7 @@ CREATE TABLE IF NOT EXISTS `sc_student`
     `create_time`        bigint      DEFAULT NULL,
     `update_time`        bigint      DEFAULT NULL,
     PRIMARY KEY (`id`),
-    UNIQUE KEY `exam_number` (`exam_id`, `exam_number`),
-    UNIQUE KEY `exam_student_subject` (`exam_id`, `student_code`, `subject_code`),
+    UNIQUE KEY `exam_student_subject` (`exam_id`, `exam_number`, `subject_code`),
     KEY `exam_assigned` (`exam_id`, `assigned`, `assigned_check_count`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4;

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

@@ -1,13 +1,14 @@
 package cn.com.qmth.scancentral.bean;
 
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.PaperTypeStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.PagerQuery;
 
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
 public class AnswerQueryDomain extends PagerQuery {
 
     @NotNull(message = "考试ID不能为空")
@@ -19,8 +20,6 @@ public class AnswerQueryDomain extends PagerQuery {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String packageCode;
@@ -83,14 +82,6 @@ public class AnswerQueryDomain extends PagerQuery {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -1,13 +1,14 @@
 package cn.com.qmth.scancentral.bean;
 
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.PaperTypeStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 import cn.com.qmth.scancentral.util.PagerQuery;
 
-import javax.validation.constraints.NotNull;
-import java.util.List;
-
 public class AssignedQueryDomain extends PagerQuery {
 
     @NotNull(message = "考试ID不能为空")
@@ -15,8 +16,6 @@ public class AssignedQueryDomain extends PagerQuery {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String packageCode;
@@ -83,14 +82,6 @@ public class AssignedQueryDomain extends PagerQuery {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -7,7 +7,6 @@ public class ImportStudentDomain {
     private String subjectName;
     private String examNumber;
     private String name;
-    private String studentCode;
     private String packageCode;
     private String examSite;
     private String examSiteName;
@@ -52,17 +51,6 @@ public class ImportStudentDomain {
         this.name = name;
     }
 
-    
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    
     public String getPackageCode() {
         return packageCode;
     }

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudentAnswerGroupCondition.java

@@ -1,267 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-import cn.com.qmth.scancentral.enums.ExamStatus;
-import cn.com.qmth.scancentral.enums.PaperTypeStatus;
-import cn.com.qmth.scancentral.enums.ScanStatus;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-public class StudentAnswerGroupCondition {
-
-    private Long examId;
-
-    private ExamStatus examStatus;
-
-    private String examNumber;
-
-    private String studentCode;
-
-    private String name;
-
-    private String packageCode;
-
-    private String campusCode;
-
-    private String campusName;
-
-    private String subjectCode;
-
-    private String examSite;
-
-    private String examRoom;
-
-    private String province;
-
-    private PaperTypeStatus paperTypeStatus;
-
-    private String device;
-
-    private Boolean absentSuspect;
-
-    private Boolean omrAbsent;
-
-    private Boolean assigned;
-
-    private Boolean incomplete;
-
-    private Boolean questionFilled;
-
-    private Boolean subjectiveFilled;
-
-    private Long startTime;
-
-    private Long endTime;
-
-    private Boolean assignedSuspect;
-
-    private Integer assignedCheckCount;
-
-    @ApiModelProperty(hidden = true)
-    @JsonIgnore
-    private List<ScanStatus> status;
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getExamSite() {
-        return examSite;
-    }
-
-    public void setExamSite(String examSite) {
-        this.examSite = examSite;
-    }
-
-    public String getExamRoom() {
-        return examRoom;
-    }
-
-    public void setExamRoom(String examRoom) {
-        this.examRoom = examRoom;
-    }
-
-    public Boolean getAbsentSuspect() {
-        return absentSuspect;
-    }
-
-    public void setAbsentSuspect(Boolean absentSuspect) {
-        this.absentSuspect = absentSuspect;
-    }
-
-    public Boolean getOmrAbsent() {
-        return omrAbsent;
-    }
-
-    public void setOmrAbsent(Boolean omrAbsent) {
-        this.omrAbsent = omrAbsent;
-    }
-
-    public Boolean getAssigned() {
-        return assigned;
-    }
-
-    public void setAssigned(Boolean assigned) {
-        this.assigned = assigned;
-    }
-
-    public Boolean getIncomplete() {
-        return incomplete;
-    }
-
-    public void setIncomplete(Boolean incomplete) {
-        this.incomplete = incomplete;
-    }
-
-    public Boolean getQuestionFilled() {
-        return questionFilled;
-    }
-
-    public void setQuestionFilled(Boolean questionFilled) {
-        this.questionFilled = questionFilled;
-    }
-
-    public ExamStatus getExamStatus() {
-        return examStatus;
-    }
-
-    public void setExamStatus(ExamStatus examStatus) {
-        this.examStatus = examStatus;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public PaperTypeStatus getPaperTypeStatus() {
-        return paperTypeStatus;
-    }
-
-    public void setPaperTypeStatus(PaperTypeStatus paperTypeStatus) {
-        this.paperTypeStatus = paperTypeStatus;
-    }
-
-    public String getDevice() {
-        return device;
-    }
-
-    public void setDevice(String device) {
-        this.device = device;
-    }
-
-    public String getCampusName() {
-        return campusName;
-    }
-
-    public void setCampusName(String campusName) {
-        this.campusName = campusName;
-    }
-
-    public List<ScanStatus> getStatus() {
-        return status;
-    }
-
-    public void setStatus(List<ScanStatus> status) {
-        this.status = status;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-
-    public Long getStartTime() {
-        return startTime;
-    }
-
-
-    public void setStartTime(Long startTime) {
-        this.startTime = startTime;
-    }
-
-
-    public Long getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Long endTime) {
-        this.endTime = endTime;
-    }
-
-    public Boolean getSubjectiveFilled() {
-        return subjectiveFilled;
-    }
-
-    public void setSubjectiveFilled(Boolean subjectiveFilled) {
-        this.subjectiveFilled = subjectiveFilled;
-    }
-
-    public Boolean getAssignedSuspect() {
-        return assignedSuspect;
-    }
-
-    public void setAssignedSuspect(Boolean assignedSuspect) {
-        this.assignedSuspect = assignedSuspect;
-    }
-
-    public Integer getAssignedCheckCount() {
-        return assignedCheckCount;
-    }
-
-    public void setAssignedCheckCount(Integer assignedCheckCount) {
-        this.assignedCheckCount = assignedCheckCount;
-    }
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupCountVo.java

@@ -1,17 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupCountVo {
-
-    private Integer totalCount;
-
-
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupIdVo.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupIdVo {
-
-    private Long id;
-
-    
-    public Long getId() {
-        return id;
-    }
-
-    
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupMarkedVo.java

@@ -1,107 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-import cn.com.qmth.scancentral.enums.ScanStatus;
-
-public class StudnetAnswerGroupMarkedVo {
-
-    private String examNumber;
-
-    private String name;
-
-    private String studentCode;
-
-    private String subjectCode;
-
-    private String subjectName;
-
-    private String packageCode;
-
-    private String campusCode;
-
-    private String examSite;
-
-    private ScanStatus status;
-
-    private String paperType;
-
-    public String getExamNumber() {
-        return examNumber;
-    }
-
-    public void setExamNumber(String examNumber) {
-        this.examNumber = examNumber;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-    public String getSubjectName() {
-        return subjectName;
-    }
-
-    public void setSubjectName(String subjectName) {
-        this.subjectName = subjectName;
-    }
-
-    public String getPackageCode() {
-        return packageCode;
-    }
-
-    public void setPackageCode(String packageCode) {
-        this.packageCode = packageCode;
-    }
-
-    public String getCampusCode() {
-        return campusCode;
-    }
-
-    public void setCampusCode(String campusCode) {
-        this.campusCode = campusCode;
-    }
-
-    public String getExamSite() {
-        return examSite;
-    }
-
-    public void setExamSite(String examSite) {
-        this.examSite = examSite;
-    }
-
-    public ScanStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(ScanStatus status) {
-        this.status = status;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupSaveVo.java

@@ -1,20 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupSaveVo {
-
-    private Long id;
-
-    
-    public Long getId() {
-        return id;
-    }
-
-    
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupSummaryQuery.java

@@ -1,25 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupSummaryQuery {
-
-    private Long examId;
-
-    private String subjectCode;
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getSubjectCode() {
-        return subjectCode;
-    }
-
-    public void setSubjectCode(String subjectCode) {
-        this.subjectCode = subjectCode;
-    }
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupSummaryVo.java

@@ -1,25 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupSummaryVo {
-
-    private Integer system;
-
-    private Integer mark;
-
-    public Integer getSystem() {
-        return system;
-    }
-
-    public void setSystem(Integer system) {
-        this.system = system;
-    }
-
-    public Integer getMark() {
-        return mark;
-    }
-
-    public void setMark(Integer mark) {
-        this.mark = mark;
-    }
-
-}

src/main/java/cn/com/qmth/scancentral/bean/answergroup/StudnetAnswerGroupVo.java

@@ -1,75 +0,0 @@
-package cn.com.qmth.scancentral.bean.answergroup;
-
-public class StudnetAnswerGroupVo {
-
-    private Long id;
-
-    private StudentAnswerGroupCondition conditions;
-
-    private Boolean reseting;
-
-    private Boolean building;
-
-    private Boolean deleting;
-
-    private Integer totalCount;
-
-    private Integer todoCount;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public StudentAnswerGroupCondition getConditions() {
-        return conditions;
-    }
-
-    public void setConditions(StudentAnswerGroupCondition conditions) {
-        this.conditions = conditions;
-    }
-
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public Integer getTodoCount() {
-        return todoCount;
-    }
-
-    public void setTodoCount(Integer todoCount) {
-        this.todoCount = todoCount;
-    }
-
-    public Boolean getReseting() {
-        return reseting;
-    }
-
-    public void setReseting(Boolean reseting) {
-        this.reseting = reseting;
-    }
-
-    public Boolean getBuilding() {
-        return building;
-    }
-
-    public void setBuilding(Boolean building) {
-        this.building = building;
-    }
-
-    public Boolean getDeleting() {
-        return deleting;
-    }
-
-    public void setDeleting(Boolean deleting) {
-        this.deleting = deleting;
-    }
-
-}

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

@@ -1,21 +1,30 @@
 package cn.com.qmth.scancentral.dao;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
 import cn.com.qmth.scancentral.bean.AbsentQueryDomain;
 import cn.com.qmth.scancentral.bean.AnswerQueryDomain;
 import cn.com.qmth.scancentral.bean.AssignedQueryDomain;
-import cn.com.qmth.scancentral.bean.answergroup.StudentAnswerGroupCondition;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupMarkedVo;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupSummaryQuery;
 import cn.com.qmth.scancentral.entity.StudentEntity;
-import cn.com.qmth.scancentral.vo.*;
+import cn.com.qmth.scancentral.vo.AbsentInfoVo;
+import cn.com.qmth.scancentral.vo.AbsentQueryVo;
+import cn.com.qmth.scancentral.vo.AnswerExportVo;
+import cn.com.qmth.scancentral.vo.CampusVo;
+import cn.com.qmth.scancentral.vo.ExamSiteVo;
+import cn.com.qmth.scancentral.vo.ExportCetMarkingQueryVo;
+import cn.com.qmth.scancentral.vo.ExportCetVo;
+import cn.com.qmth.scancentral.vo.ImportStudentQueryVo;
+import cn.com.qmth.scancentral.vo.ImportStudentVo;
+import cn.com.qmth.scancentral.vo.ScanAnswerInfoVo;
+import cn.com.qmth.scancentral.vo.StudentUploadVo;
 import cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo;
 import cn.com.qmth.scancentral.vo.assginedcheck.AssignedCheckExport;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface StudentDao extends BaseMapper<StudentEntity> {
 
@@ -24,16 +33,16 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
     List<ExamSiteVo> listSiteByExamId(@Param("examId") Long examId);
 
     AbsentInfoVo absentInfo(@Param("examId") Long examId, @Param("groupType") String groupType,
-                            @Param("groupName") String groupName);
+            @Param("groupName") String groupName);
 
     List<String> absentQuerySummary(@Param("groupNameCol") String groupNameCol,
-                                    @Param("query") AbsentQueryDomain query);
+            @Param("query") AbsentQueryDomain query);
 
     IPage<AbsentQueryVo> absentQueryPage(Page<AbsentQueryVo> page, @Param("groupNameCol") String groupNameCol,
-                                         @Param("query") AbsentQueryDomain query);
+            @Param("query") AbsentQueryDomain query);
 
     List<AbsentQueryVo> absentExportList(Page<AbsentQueryVo> page, @Param("groupNameCol") String groupNameCol,
-                                         @Param("query") AbsentQueryDomain query);
+            @Param("query") AbsentQueryDomain query);
 
     IPage<AnswerQueryVo> queryPage(Page<AnswerQueryVo> page, @Param("query") AnswerQueryDomain query);
 
@@ -61,21 +70,16 @@ public interface StudentDao extends BaseMapper<StudentEntity> {
 
     ScanAnswerInfoVo getInfoCountByExam(@Param("examId") Long examId);
 
-    Integer queryStudentAnswerGroupCount(@Param("query") StudentAnswerGroupCondition query);
-
-    List<Long> findStudentAnswerTask(@Param("query") StudentAnswerGroupCondition query);
-
-    Integer getStudentAnswerCount(@Param("query") StudnetAnswerGroupSummaryQuery query);
-
-    List<StudnetAnswerGroupMarkedVo> getStudentAnswerMarkedList(@Param("examId") Long examId);
-
-    List<AssignedCheckExport> exportAssignedCheckPage(Page<AssignedCheckExport> page, @Param("query") AssignedQueryDomain query);
+    List<AssignedCheckExport> exportAssignedCheckPage(Page<AssignedCheckExport> page,
+            @Param("query") AssignedQueryDomain query);
 
     IPage<AnswerQueryVo> queryAssignedCheckPage(Page<AnswerQueryVo> page, @Param("query") AssignedQueryDomain query);
 
-    List<AnswerQueryVo> findUnCheck(@Param("examId")Long examId,@Param("pageNumber") int pageNumber, @Param("pageSize")int pageSize,@Param("checkCount") int checkCount);
+    List<AnswerQueryVo> findUnCheck(@Param("examId") Long examId, @Param("pageNumber") int pageNumber,
+            @Param("pageSize") int pageSize, @Param("checkCount") int checkCount);
 
-    List<AnswerQueryVo> getAssignedCheckTaskHistory(@Param("id")Long id,@Param("pageSize") Long pageSize,@Param("userId") Long userId,@Param("examId") Long examId);
+    List<AnswerQueryVo> getAssignedCheckTaskHistory(@Param("id") Long id, @Param("pageSize") Long pageSize,
+            @Param("userId") Long userId, @Param("examId") Long examId);
 
-    void updateAssignedCheckCount(@Param("id")Long id);
+    void updateAssignedCheckCount(@Param("id") Long id);
 }

src/main/java/cn/com/qmth/scancentral/model/ManualAbsentImportDTO.java

@@ -7,18 +7,18 @@ import com.qmth.boot.tools.excel.annotation.ExcelColumn;
  */
 public class ManualAbsentImportDTO {
 
-    @ExcelColumn(name = "考生编号", nullable = false, index = 1)
-    private String studentCode;
+    @ExcelColumn(name = "准考证号", nullable = false, index = 1)
+    private String examNumber;
 
     @ExcelColumn(name = "科目代码", nullable = false, index = 2)
     private String subjectCode;
 
-    public String getStudentCode() {
-        return studentCode;
+    public String getExamNumber() {
+        return examNumber;
     }
 
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
     }
 
     public String getSubjectCode() {

src/main/java/cn/com/qmth/scancentral/model/StudentInfo.java

@@ -10,8 +10,6 @@ public class StudentInfo {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -52,14 +50,6 @@ public class StudentInfo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -18,9 +18,6 @@ import cn.com.qmth.scancentral.bean.ImportCetAbsentDomain;
 import cn.com.qmth.scancentral.bean.ImportStudentDomain;
 import cn.com.qmth.scancentral.bean.PageDeleteDomain;
 import cn.com.qmth.scancentral.bean.User;
-import cn.com.qmth.scancentral.bean.answergroup.StudentAnswerGroupCondition;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupMarkedVo;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupSummaryQuery;
 import cn.com.qmth.scancentral.bean.omredit.OmrEditDomain;
 import cn.com.qmth.scancentral.bean.refix.AnswerRefixDomain;
 import cn.com.qmth.scancentral.entity.StudentEntity;
@@ -111,8 +108,6 @@ public interface StudentService extends IService<StudentEntity> {
 
     boolean existUploadData(Long schoolId);
 
-    StudentEntity findByStudentCodeAndSubjectCode(Long examId, String studentCode, String subjectCode);
-
     List<AbsentQueryVo> absentExportList(AbsentQueryDomain query);
 
     List<AnswerExportVo> exportList(AnswerQueryDomain query);
@@ -131,7 +126,7 @@ public interface StudentService extends IService<StudentEntity> {
 
     int importStudent(List<ImportStudentDomain> students);
 
-    StudentEntity findByExamAndSubjectCodeAndStudentCode(Long examId, String subjectCode, String studentCode);
+    StudentEntity findByExamAndSubjectCodeAndExamNumber(Long examId, String subjectCode, String examNumber);
 
     int countByQuery(ImportStudentQueryVo query);
 
@@ -159,16 +154,8 @@ public interface StudentService extends IService<StudentEntity> {
 
     void updateCheckMark(Long studentId, Boolean tag);
 
-    Integer queryStudentAnswerGroupCount(StudentAnswerGroupCondition query);
-
-    List<Long> findStudentAnswerTask(StudentAnswerGroupCondition condition);
-
-    Integer getStudentAnswerCount(StudnetAnswerGroupSummaryQuery query);
-
     Integer getStudentAnswerCount(Long examId);
 
-    List<StudnetAnswerGroupMarkedVo> getStudentAnswerMarkedList(Long examId);
-
     void uploadData(StudentUploadVo vo);
 
     void resetExamStatus(Long examId, Integer examNumberFillCount);

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

@@ -1,12 +1,6 @@
 package cn.com.qmth.scancentral.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.math.RandomUtils;
@@ -33,43 +27,15 @@ import cn.com.qmth.scancentral.bean.WorkloadDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerDomain;
 import cn.com.qmth.scancentral.bean.answersave.AnswerPaper;
 import cn.com.qmth.scancentral.dao.BatchDao;
-import cn.com.qmth.scancentral.entity.AnswerCardEntity;
-import cn.com.qmth.scancentral.entity.BatchEntity;
-import cn.com.qmth.scancentral.entity.BatchPaperEntity;
-import cn.com.qmth.scancentral.entity.ExamEntity;
-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.entity.SubjectEntity;
-import cn.com.qmth.scancentral.enums.BatchStatus;
-import cn.com.qmth.scancentral.enums.CheckStatus;
-import cn.com.qmth.scancentral.enums.LockType;
-import cn.com.qmth.scancentral.enums.Role;
-import cn.com.qmth.scancentral.enums.VerifyStatus;
+import cn.com.qmth.scancentral.entity.*;
+import cn.com.qmth.scancentral.enums.*;
 import cn.com.qmth.scancentral.exception.NotFoundExceptions;
 import cn.com.qmth.scancentral.exception.ParameterExceptions;
-import cn.com.qmth.scancentral.service.AnswerCardService;
-import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
-import cn.com.qmth.scancentral.service.AssignedCheckHistoryService;
-import cn.com.qmth.scancentral.service.BatchPaperService;
-import cn.com.qmth.scancentral.service.BatchService;
-import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.FilePropertyService;
-import cn.com.qmth.scancentral.service.FileService;
-import cn.com.qmth.scancentral.service.PaperPageService;
-import cn.com.qmth.scancentral.service.PaperService;
-import cn.com.qmth.scancentral.service.StudentService;
-import cn.com.qmth.scancentral.service.SubjectService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.support.TaskLock;
 import cn.com.qmth.scancentral.support.TaskLockUtil;
 import cn.com.qmth.scancentral.util.PageUtil;
-import cn.com.qmth.scancentral.vo.BatchFinishVo;
-import cn.com.qmth.scancentral.vo.BatchQueryVo;
-import cn.com.qmth.scancentral.vo.BatchVerifyVo;
-import cn.com.qmth.scancentral.vo.ScannerWorkloadVo;
-import cn.com.qmth.scancentral.vo.SheetUploadVo;
-import cn.com.qmth.scancentral.vo.SliceUploadVo;
+import cn.com.qmth.scancentral.vo.*;
 import cn.com.qmth.scancentral.vo.batch.AnswerSaveVo;
 import cn.com.qmth.scancentral.vo.batch.BatchCreateVo;
 import cn.com.qmth.scancentral.vo.batch.Paper;
@@ -149,7 +115,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
         List<Rescan> rescan = new ArrayList<>();
         String packageCode = null;
         for (String examNumber : domain.getExamNumbers()) {
-            StudentEntity student = studentService.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(),
+            StudentEntity student = studentService.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(),
                     domain.getSubjectCode(), examNumber);
             if (student == null) {
                 throw new ParameterException("未找到考生信息:" + examNumber);
@@ -304,7 +270,7 @@ public class BatchServiceImpl extends ServiceImpl<BatchDao, BatchEntity> impleme
             throw ParameterExceptions.EXAM_NOT_FOUND;
         }
         String examNumber = domain.getExamNumber();
-        StudentEntity student = studentService.findByExamAndSubjectCodeAndStudentCode(batch.getExamId(),
+        StudentEntity student = studentService.findByExamAndSubjectCodeAndExamNumber(batch.getExamId(),
                 domain.getSubjectCode(), examNumber);
         if (student == null) {
             throw new ParameterException("考生信息未找到");

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

@@ -34,27 +34,10 @@ 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.AnswerCardEntity;
-import cn.com.qmth.scancentral.entity.BatchPaperEntity;
-import cn.com.qmth.scancentral.entity.ExamEntity;
-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.entity.SubjectEntity;
+import cn.com.qmth.scancentral.entity.*;
 import cn.com.qmth.scancentral.enums.LockType;
 import cn.com.qmth.scancentral.enums.UploadStatus;
-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.ExamService;
-import cn.com.qmth.scancentral.service.FilePropertyService;
-import cn.com.qmth.scancentral.service.FileService;
-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.service.SubjectService;
+import cn.com.qmth.scancentral.service.*;
 import cn.com.qmth.scancentral.util.PageUtil;
 import cn.com.qmth.scancentral.vo.MismatchToggleVo;
 import cn.com.qmth.scancentral.vo.PaperMigrateVo;
@@ -288,7 +271,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperDao, PaperEntity> impleme
             throw new ParameterException("卡格式信息未找到");
         }
         // 查找目标考生
-        StudentEntity student = studentService.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(),
+        StudentEntity student = studentService.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(),
                 domain.getSubjectCode(), domain.getExamNumber());
         if (student == null) {
             throw new ParameterException("考生信息未找到, 准考证号=" + domain.getExamNumber());

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

@@ -37,7 +37,6 @@ import com.qmth.boot.core.collection.PageResult;
 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 com.qmth.boot.core.retrofit.utils.SignatureInfo;
 import com.qmth.boot.tools.excel.ExcelReader;
 import com.qmth.boot.tools.excel.enums.ExcelType;
@@ -53,9 +52,6 @@ import cn.com.qmth.scancentral.bean.ImportStudentDomain;
 import cn.com.qmth.scancentral.bean.PageDeleteDomain;
 import cn.com.qmth.scancentral.bean.SchoolSession;
 import cn.com.qmth.scancentral.bean.User;
-import cn.com.qmth.scancentral.bean.answergroup.StudentAnswerGroupCondition;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupMarkedVo;
-import cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupSummaryQuery;
 import cn.com.qmth.scancentral.bean.answersave.ArrayResult;
 import cn.com.qmth.scancentral.bean.answersave.StringResult;
 import cn.com.qmth.scancentral.bean.omredit.OmrEditDomain;
@@ -90,10 +86,8 @@ import cn.com.qmth.scancentral.model.ManualAbsentImportDTO;
 import cn.com.qmth.scancentral.service.AnswerCardService;
 import cn.com.qmth.scancentral.service.AnswerCardSubjectService;
 import cn.com.qmth.scancentral.service.AssignedCheckHistoryService;
-import cn.com.qmth.scancentral.service.BatchPaperService;
 import cn.com.qmth.scancentral.service.BatchService;
 import cn.com.qmth.scancentral.service.ExamService;
-import cn.com.qmth.scancentral.service.FilePropertyService;
 import cn.com.qmth.scancentral.service.OmrGroupService;
 import cn.com.qmth.scancentral.service.OmrTaskService;
 import cn.com.qmth.scancentral.service.PaperPageService;
@@ -186,15 +180,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Autowired
     private ToolExportService toolExportService;
 
-    @Autowired
-    private BatchPaperService batchPaperService;
-
-    @Autowired
-    private FilePropertyService filePropertyService;
-
-    @Autowired
-    private FileStore fileStore;
-
     @Autowired
     private SessionService sessionService;
 
@@ -333,22 +318,15 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         return baseMapper.listCampusByExamId(examId);
     }
 
-    @Override
-    public Integer getStudentAnswerCount(StudnetAnswerGroupSummaryQuery query) {
-        if (query.getExamId() == null) {
-            throw new ParameterException("examId不能为空");
-        }
-        return baseMapper.getStudentAnswerCount(query);
-    }
-
     @Override
     public Integer getStudentAnswerCount(Long examId) {
         if (examId == null) {
             throw new ParameterException("examId不能为空");
         }
-        StudnetAnswerGroupSummaryQuery query = new StudnetAnswerGroupSummaryQuery();
-        query.setExamId(examId);
-        return baseMapper.getStudentAnswerCount(query);
+        QueryWrapper<StudentEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(StudentEntity::getExamId, examId);
+        queryWrapper.lambda().eq(StudentEntity::getCheckMark, true);
+        return this.count(queryWrapper);
     }
 
     @Override
@@ -359,14 +337,14 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Override
     public StudentVo findOne(StudentQuery query) {
         Long examId = query.getExamId();
-        String studentCode = query.getStudentCode();
+        String examNumber = query.getExamNumber();
         String subjectCode = query.getSubjectCode();
-        if (StringUtils.isBlank(studentCode) || StringUtils.isBlank(subjectCode)) {
-            throw new ParameterException("studentCode subjectCode不能都为空");
+        if (StringUtils.isBlank(examNumber) || StringUtils.isBlank(subjectCode)) {
+            throw new ParameterException("examNumber subjectCode不能都为空");
         }
         QueryWrapper<StudentEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StudentEntity::getExamId, examId);
-        queryWrapper.lambda().eq(StudentEntity::getExamNumber, studentCode);
+        queryWrapper.lambda().eq(StudentEntity::getExamNumber, examNumber);
         queryWrapper.lambda().eq(StudentEntity::getSubjectCode, subjectCode);
         StudentEntity s = baseMapper.selectOne(queryWrapper);
         if (s == null) {
@@ -436,21 +414,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         return this.list(queryWrapper);
     }
 
-    @Override
-    public StudentEntity findByStudentCodeAndSubjectCode(Long examId, String studentCode, String subjectCode) {
-        if (StringUtils.isBlank(studentCode)) {
-            throw new ParameterException("考生编号不能为空");
-        }
-        if (StringUtils.isBlank(subjectCode)) {
-            throw new ParameterException("科目代码不能为空");
-        }
-        QueryWrapper<StudentEntity> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(StudentEntity::getExamId, examId);
-        queryWrapper.lambda().eq(StudentEntity::getExamNumber, studentCode);
-        queryWrapper.lambda().eq(StudentEntity::getSubjectCode, subjectCode);
-        return baseMapper.selectOne(queryWrapper);
-    }
-
     @Override
     public int getAssignedCountByExam(Long examId) {
         QueryWrapper<StudentEntity> wrapper = new QueryWrapper<>();
@@ -561,17 +524,17 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         int ignoreCount = 0;
         int suspectCount = 0;
         for (ManualAbsentImportDTO data : list) {
-            String studentCode = trimAndNullIfBlank(data.getStudentCode());
+            String examNumber = trimAndNullIfBlank(data.getExamNumber());
             String subjectCode = trimAndNullIfBlank(data.getSubjectCode());
-            if (StringUtils.isBlank(studentCode)) {
-                throw new ParameterException("考生编号不能为空");
+            if (StringUtils.isBlank(examNumber)) {
+                throw new ParameterException("examNumber不能为空");
             }
             if (StringUtils.isBlank(subjectCode)) {
                 throw new ParameterException("科目代码不能为空");
             }
-            StudentEntity student = findByStudentCodeAndSubjectCode(examId, studentCode, subjectCode);
+            StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(examId, subjectCode, examNumber);
             if (student == null) {
-                throw new ParameterException("考生信息未找到:" + studentCode + ":" + subjectCode);
+                throw new ParameterException("考生信息未找到:" + examNumber + ":" + subjectCode);
             }
             if (ScanStatus.MANUAL_ABSENT.equals(student.getStatus())) {
                 ignoreCount++;
@@ -601,7 +564,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Transactional
     @Override
     public UpdateTimeVo absentManualUpdate(Long examId, String subjectCode, String examNumber) {
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(examId, subjectCode, examNumber);
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(examId, subjectCode, examNumber);
         if (student == null) {
             throw new ParameterException("考生未找到:" + examNumber);
         }
@@ -620,7 +583,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Transactional
     @Override
     public UpdateTimeVo absentSuspectUpdate(Long examId, String subjectCode, String examNumber, boolean enable) {
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(examId, subjectCode, examNumber);
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(examId, subjectCode, examNumber);
         if (student == null) {
             throw new ParameterException("考生未找到:" + examNumber);
         }
@@ -849,11 +812,11 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             // map.put(domain.getExamId(), examMap);
             // }
             // StudentEntity entity = examMap.get(domain.getExamNumber());
-            StudentEntity entity = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(),
+            StudentEntity entity = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(),
                     domain.getSubjectCode(), domain.getExamNumber());
             if (entity == null) {
-                entity = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(), domain.getSubjectCode(),
-                        domain.getStudentCode());
+                entity = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(), domain.getSubjectCode(),
+                        domain.getExamNumber());
             }
             if (entity == null) {
                 entity = new StudentEntity();
@@ -874,7 +837,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             entity.setExamId(domain.getExamId());
             entity.setName(domain.getName());
             entity.setSubjectCode(domain.getSubjectCode());
-            entity.setExamNumber(domain.getStudentCode());
+            entity.setExamNumber(domain.getExamNumber());
             entity.setPackageCode(domain.getPackageCode());
             entity.setExamRoom(domain.getExamRoom());
             entity.setExamSite(domain.getExamSite());
@@ -893,20 +856,20 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     }
 
     @Override
-    public StudentEntity findByExamAndSubjectCodeAndStudentCode(Long examId, String subjectCode, String studentCode) {
+    public StudentEntity findByExamAndSubjectCodeAndExamNumber(Long examId, String subjectCode, String examNumber) {
         if (examId == null) {
             throw new ParameterException("examId 不能为空");
         }
         if (StringUtils.isBlank(subjectCode)) {
             throw new ParameterException("subjectCode不能为空");
         }
-        if (StringUtils.isBlank(studentCode)) {
-            throw new ParameterException("studentCode不能为空");
+        if (StringUtils.isBlank(examNumber)) {
+            throw new ParameterException("examNumber");
         }
         QueryWrapper<StudentEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(StudentEntity::getExamId, examId);
         queryWrapper.lambda().eq(StudentEntity::getSubjectCode, subjectCode);
-        queryWrapper.lambda().eq(StudentEntity::getExamNumber, studentCode);
+        queryWrapper.lambda().eq(StudentEntity::getExamNumber, examNumber);
         return baseMapper.selectOne(queryWrapper);
     }
 
@@ -1023,7 +986,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     // @Lockable
     public PaperDeleteVo paperDelete(User user, PageDeleteDomain domain) {
         Integer paperNumber = domain.getPaperNumber();
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(), domain.getSubjectCode(),
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(), domain.getSubjectCode(),
                 domain.getExamNumber());
         if (student == null) {
             throw new ParameterException("考生信息未找到");
@@ -1067,8 +1030,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     public AnswerDeleteVo answerDelete(User user, AnswerDeleteDomain domain) {
         Long examId = domain.getExamId();
         String examNumber = domain.getExamNumber();
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(examId, domain.getSubjectCode(),
-                examNumber);
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(examId, domain.getSubjectCode(), examNumber);
         if (student == null) {
             throw new ParameterException("考生信息未找到");
         }
@@ -1089,7 +1051,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Override
     // @Lockable
     public AnswerRefixVo answerRefix(User user, AnswerRefixDomain domain) {
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(), domain.getSubjectCode(),
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(), domain.getSubjectCode(),
                 domain.getExamNumber());
         if (student == null) {
             throw new ParameterException("考生信息未找到");
@@ -1147,7 +1109,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
     @Transactional
     @Override
     public UpdateTimeVo omrEdit(User user, OmrEditDomain domain) {
-        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(), domain.getSubjectCode(),
+        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(), domain.getSubjectCode(),
                 domain.getExamNumber());
         if (student == null) {
             throw new ParameterException("考生信息未找到");
@@ -1193,7 +1155,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
             // if (domain.getAbsent() == null) {
             // throw new StatusException("缺考信息不能为空");
             // }
-            StudentEntity entity = this.findByExamAndSubjectCodeAndStudentCode(domain.getExamId(),
+            StudentEntity entity = this.findByExamAndSubjectCodeAndExamNumber(domain.getExamId(),
                     domain.getSubjectCode(), domain.getExamNumber());
             if (entity == null) {
                 throw new StatusException("未找到考生");
@@ -1507,30 +1469,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
         this.update(updateWrapper);
     }
 
-    @Override
-    public Integer queryStudentAnswerGroupCount(StudentAnswerGroupCondition query) {
-        if (query.getExamId() == null) {
-            throw new ParameterException("examId 不能为空");
-        }
-        List<ScanStatus> status = new ArrayList<>();
-        status.add(ScanStatus.SCANNED);
-        query.setStatus(status);
-        return baseMapper.queryStudentAnswerGroupCount(query);
-    }
-
-    @Override
-    public List<Long> findStudentAnswerTask(StudentAnswerGroupCondition query) {
-        List<ScanStatus> status = new ArrayList<>();
-        status.add(ScanStatus.SCANNED);
-        query.setStatus(status);
-        return baseMapper.findStudentAnswerTask(query);
-    }
-
-    @Override
-    public List<StudnetAnswerGroupMarkedVo> getStudentAnswerMarkedList(Long examId) {
-        return baseMapper.getStudentAnswerMarkedList(examId);
-    }
-
     @Transactional
     @Override
     public void pictureCopy(StudentUploadVo vo) {
@@ -1867,7 +1805,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, StudentEntity> i
                     if (examNumbers.containsKey(examNumber)) {
                         msg.append("  准考证号有重复");
                     } else {
-                        StudentEntity student = this.findByExamAndSubjectCodeAndStudentCode(examId, subjectCode,
+                        StudentEntity student = this.findByExamAndSubjectCodeAndExamNumber(examId, subjectCode,
                                 examNumber);
                         if (student == null) {
                             msg.append("  准考证号不存在");

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

@@ -9,8 +9,6 @@ public class ImportStudentQueryVo extends PagerQuery {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -36,14 +34,6 @@ public class ImportStudentQueryVo extends PagerQuery {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -8,8 +8,6 @@ public class ImportStudentVo {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -42,14 +40,6 @@ public class ImportStudentVo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -14,8 +14,6 @@ public class StudentUploadVo {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -76,14 +74,6 @@ public class StudentUploadVo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

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

@@ -1,18 +1,16 @@
 package cn.com.qmth.scancentral.vo.answerquery;
 
+import java.util.List;
+
 import cn.com.qmth.scancentral.enums.ExamStatus;
 import cn.com.qmth.scancentral.enums.ScanStatus;
 
-import java.util.List;
-
 public class AnswerQueryVo {
 
     private Long id;
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -82,14 +80,6 @@ public class AnswerQueryVo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/vo/batchdetail/BatchDetailDO.java

@@ -1,10 +1,11 @@
 package cn.com.qmth.scancentral.vo.batchdetail;
 
-import cn.com.qmth.scancentral.bean.answersave.BoolResult;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 
-import java.util.List;
+import cn.com.qmth.scancentral.bean.answersave.BoolResult;
 
 public class BatchDetailDO {
 
@@ -14,8 +15,6 @@ public class BatchDetailDO {
 
     private String seatNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -54,14 +53,6 @@ public class BatchDetailDO {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/vo/batchdetail/BatchStudentVo.java

@@ -9,8 +9,6 @@ public class BatchStudentVo {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -39,13 +37,6 @@ public class BatchStudentVo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
 
     public String getName() {
         return name;
@@ -99,7 +90,6 @@ public class BatchStudentVo {
         BatchStudentVo detail = new BatchStudentVo();
         detail.setId(item.getId());
         detail.setExamNumber(item.getExamNumber());
-        detail.setStudentCode(item.getStudentCode());
         detail.setName(item.getName());
         detail.setSubjectCode(item.getSubjectCode());
         detail.setSubjectName(item.getSubjectName());

src/main/java/cn/com/qmth/scancentral/vo/mismatchquery/MismatchQueryVo.java

@@ -9,8 +9,6 @@ public class MismatchQueryVo {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String name;
 
     private String subjectCode;
@@ -35,14 +33,6 @@ public class MismatchQueryVo {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getName() {
         return name;
     }

src/main/java/cn/com/qmth/scancentral/vo/student/StudentQuery.java

@@ -9,8 +9,6 @@ public class StudentQuery {
 
     private String examNumber;
 
-    private String studentCode;
-
     private String subjectCode;
 
     public Long getExamId() {
@@ -29,14 +27,6 @@ public class StudentQuery {
         this.examNumber = examNumber;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getSubjectCode() {
         return subjectCode;
     }

src/main/java/cn/com/qmth/scancentral/vo/student/StudentVo.java

@@ -11,8 +11,6 @@ public class StudentVo {
 
     private String name;
 
-    private String studentCode;
-
     private String subjectCode;
 
     private String subjectName;
@@ -41,7 +39,6 @@ public class StudentVo {
         vo.setId(e.getId());
         vo.setExamNumber(e.getExamNumber());
         vo.setName(e.getName());
-        vo.setStudentCode(e.getExamNumber());
         vo.setSubjectCode(e.getSubjectCode());
         vo.setPackageCode(e.getPackageCode());
         vo.setCampusName(e.getCampusName());
@@ -78,14 +75,6 @@ public class StudentVo {
         this.name = name;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getSubjectCode() {
         return subjectCode;
     }
@@ -152,12 +141,7 @@ public class StudentVo {
         this.campusCode = campusCode;
     }
 
-    
-    public String getExamSiteName() {
-        return examSiteName;
-    }
 
-    
     public void setExamSiteName(String examSiteName) {
         this.examSiteName = examSiteName;
     }
@@ -172,4 +156,7 @@ public class StudentVo {
         this.status = status;
     }
 
+    public String getExamSiteName() {
+        return examSiteName;
+    }
 }

src/main/java/cn/com/qmth/scancentral/vo/verify/VerifyStudentVo.java

@@ -11,8 +11,6 @@ public class VerifyStudentVo {
 
     private String name;
 
-    private String studentCode;
-
     private String subjectCode;
 
     private String subjectName;
@@ -37,14 +35,6 @@ public class VerifyStudentVo {
         this.name = name;
     }
 
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
     public String getSubjectCode() {
         return subjectCode;
     }
@@ -72,7 +62,6 @@ public class VerifyStudentVo {
     public static VerifyStudentVo build(BatchDetailDO item) {
         VerifyStudentVo student = new VerifyStudentVo();
         student.setExamNumber(item.getExamNumber());
-        student.setStudentCode(item.getStudentCode());
         student.setName(item.getName());
         student.setSubjectCode(item.getSubjectCode());
         student.setSubjectName(item.getSubjectName());

src/main/resources/mapper/BatchMapper.xml

@@ -1,231 +1,230 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.qmth.scancentral.dao.BatchDao">
-	<resultMap id="batchDetailDOMap"
-		type="cn.com.qmth.scancentral.vo.batchdetail.BatchDetailDO">
-		<result column="slicePath" property="slicePath"
-			typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" />
-	</resultMap>
-	<update id="updateScanCount">
-		UPDATE sc_batch t
-		SET t.scan_count =
-		(select count(distinct bp.student_id) from sc_batch_paper bp where
-		bp.batch_id = #{id})
-		where t.id = #{id}
-	</update>
+    <resultMap id="batchDetailDOMap"
+               type="cn.com.qmth.scancentral.vo.batchdetail.BatchDetailDO">
+        <result column="slicePath" property="slicePath"
+                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
+    </resultMap>
+    <update id="updateScanCount">
+        UPDATE sc_batch t
+        SET t.scan_count =
+                (select count(distinct bp.student_id)
+                 from sc_batch_paper bp
+                 where bp.batch_id = #{id})
+        where t.id = #{id}
+    </update>
 
-	<update id="updateAssignedCount">
-		UPDATE sc_batch t
-		SET t.assigned_count = (select count(distinct bp.student_id)
-		from sc_batch_paper bp
-		where bp.batch_id = #{id}
-		and bp.assigned = 1)
-		WHERE t.id = #{id}
-	</update>
+    <update id="updateAssignedCount">
+        UPDATE sc_batch t
+        SET t.assigned_count = (select count(distinct bp.student_id)
+                                from sc_batch_paper bp
+                                where bp.batch_id = #{id}
+                                  and bp.assigned = 1)
+        WHERE t.id = #{id}
+    </update>
 
-	<select id="workload"
-		resultType="cn.com.qmth.scancentral.vo.ScannerWorkloadVo">
-		SELECT
-		b.device,
-		count(DISTINCT bp.student_id) answerScanCount
-		FROM
-		sc_batch b
-		left join sc_batch_paper bp on b.id=bp.batch_id
-		where
-		b.exam_id=#{examId}
-		<if test="startTime != null">
-			AND b.create_time &gt;= #{startTime}
-		</if>
-		<if test="endTime != null">
-			AND b.create_time &lt;= #{endTime}
-		</if>
-		GROUP BY b.device
-	</select>
+    <select id="workload"
+            resultType="cn.com.qmth.scancentral.vo.ScannerWorkloadVo">
+        SELECT
+        b.device,
+        count(DISTINCT bp.student_id) answerScanCount
+        FROM
+        sc_batch b
+        left join sc_batch_paper bp on b.id=bp.batch_id
+        where
+        b.exam_id=#{examId}
+        <if test="startTime != null">
+            AND b.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND b.create_time &lt;= #{endTime}
+        </if>
+        GROUP BY b.device
+    </select>
 
-	<select id="batchQueryPage"
-		resultType="cn.com.qmth.scancentral.vo.BatchQueryVo">
-		select
-		t.id,
-		t.device,
-		t.status,
-		t.package_code packageCode,
-		t.scan_count count,
-		t.assigned_count assignedCount,
-		t.create_time createTime,
-		case when t.verify_status='REJECT' or t.verify_status='CONFIRM'
-		then 1
-		else 0 end withVerify,
-		0 incomplete
-		from sc_batch t
-		where t.exam_id=#{query.examId} and t.scan_count>0
-		and (t.verify_status is null or t.verify_status!='REJECT')
-		<if test="query.device != null">
-			and t.device=#{query.device}
-		</if>
-		<if test="query.startTime != null">
-			and t.create_time &gt;= #{query.startTime}
-		</if>
-		<if test="query.endTime != null">
-			and t.create_time &lt;= #{query.endTime}
-		</if>
-		<if test="query.withVerify != null">
-			<if test="query.withVerify">
-				and t.verify_status='CONFIRM'
-			</if>
-			<if test="!query.withVerify">
-				and (t.verify_status is null or
-				t.verify_status='WAITING')
-			</if>
-		</if>
-		order by t.id desc
-	</select>
+    <select id="batchQueryPage"
+            resultType="cn.com.qmth.scancentral.vo.BatchQueryVo">
+        select
+        t.id,
+        t.device,
+        t.status,
+        t.package_code packageCode,
+        t.scan_count count,
+        t.assigned_count assignedCount,
+        t.create_time createTime,
+        case when t.verify_status='REJECT' or t.verify_status='CONFIRM'
+        then 1
+        else 0 end withVerify,
+        0 incomplete
+        from sc_batch t
+        where t.exam_id=#{query.examId} and t.scan_count>0
+        and (t.verify_status is null or t.verify_status!='REJECT')
+        <if test="query.device != null">
+            and t.device=#{query.device}
+        </if>
+        <if test="query.startTime != null">
+            and t.create_time &gt;= #{query.startTime}
+        </if>
+        <if test="query.endTime != null">
+            and t.create_time &lt;= #{query.endTime}
+        </if>
+        <if test="query.withVerify != null">
+            <if test="query.withVerify">
+                and t.verify_status='CONFIRM'
+            </if>
+            <if test="!query.withVerify">
+                and (t.verify_status is null or
+                t.verify_status='WAITING')
+            </if>
+        </if>
+        order by t.id desc
+    </select>
 
-	<select id="batchSummary" resultType="long">
-		select
-		t.id
-		from sc_batch t
-		where t.exam_id=#{query.examId} and t.scan_count>0
-		and (t.verify_status is null or t.verify_status!='REJECT')
-		<if test="query.device != null">
-			and t.device=#{query.device}
-		</if>
-		<if test="query.startTime != null">
-			and t.create_time &gt;= #{query.startTime}
-		</if>
-		<if test="query.endTime != null">
-			and t.create_time &lt;= #{query.endTime}
-		</if>
-		<if test="query.withVerify != null">
-			<if test="query.withVerify">
-				and t.verify_status='CONFIRM'
-			</if>
-			<if test="!query.withVerify">
-				and (t.verify_status is null or
-				t.verify_status='WAITING')
-			</if>
-		</if>
-		order by t.id desc
-	</select>
+    <select id="batchSummary" resultType="long">
+        select
+        t.id
+        from sc_batch t
+        where t.exam_id=#{query.examId} and t.scan_count>0
+        and (t.verify_status is null or t.verify_status!='REJECT')
+        <if test="query.device != null">
+            and t.device=#{query.device}
+        </if>
+        <if test="query.startTime != null">
+            and t.create_time &gt;= #{query.startTime}
+        </if>
+        <if test="query.endTime != null">
+            and t.create_time &lt;= #{query.endTime}
+        </if>
+        <if test="query.withVerify != null">
+            <if test="query.withVerify">
+                and t.verify_status='CONFIRM'
+            </if>
+            <if test="!query.withVerify">
+                and (t.verify_status is null or
+                t.verify_status='WAITING')
+            </if>
+        </if>
+        order by t.id desc
+    </select>
 
-	<select id="batchDetailList" resultMap="batchDetailDOMap">
-		select s.id,
-		s.exam_number examNumber,
-		s.seat_number seatNumber,
-		s.student_code studentCode,
-		s.`name` name,
-		s.subject_code subjectCode,
-		ss.name subjectName,
-		bp.assigned assigned,
-		bp.paper_number paperNumber,
-		bp.paper_id paperId,
-		pp.page_index pageIndex,
-		pp.absent absent,
-		pp.sheet_path sheetPath,
-		pp.slice_path slicePath
-		from sc_batch_paper bp
-		left join sc_student s on bp.student_id = s.id
-		left join sc_subject ss on s.subject_code = ss.code and s.exam_id = ss.exam_id
-		left join sc_paper_page pp on bp.paper_id = pp.paper_id
-		where bp.batch_id = #{id}
-		order by s.seat_number, bp.student_id, bp.paper_number, pp.page_index
-	</select>
+    <select id="batchDetailList" resultMap="batchDetailDOMap">
+        select s.id,
+               s.exam_number   examNumber,
+               s.seat_number   seatNumber,
+               s.`name`        name,
+               s.subject_code  subjectCode,
+               ss.name         subjectName,
+               bp.assigned     assigned,
+               bp.paper_number paperNumber,
+               bp.paper_id     paperId,
+               pp.page_index   pageIndex,
+               pp.absent       absent,
+               pp.sheet_path   sheetPath,
+               pp.slice_path   slicePath
+        from sc_batch_paper bp
+                 left join sc_student s on bp.student_id = s.id
+                 left join sc_subject ss on s.subject_code = ss.code and s.exam_id = ss.exam_id
+                 left join sc_paper_page pp on bp.paper_id = pp.paper_id
+        where bp.batch_id = #{id}
+        order by s.seat_number, bp.student_id, bp.paper_number, pp.page_index
+    </select>
 
-	<select id="findUnVerify"
-		resultType="cn.com.qmth.scancentral.entity.BatchEntity">
-		select b.id,
-		b.exam_id,
-		b.device,
-		b.package_code,
-		b.scan_count,
-		b.assigned_count,
-		b.status,
-		b.verify_status,
-		b.check_status,
-		b.create_time,
-		b.update_time
-		from sc_batch b
-		where b.exam_id = #{examId}
-		and b.verify_status = #{status}
-		order by b.id
-	</select>
+    <select id="findUnVerify"
+            resultType="cn.com.qmth.scancentral.entity.BatchEntity">
+        select b.id,
+               b.exam_id,
+               b.device,
+               b.package_code,
+               b.scan_count,
+               b.assigned_count,
+               b.status,
+               b.verify_status,
+               b.check_status,
+               b.create_time,
+               b.update_time
+        from sc_batch b
+        where b.exam_id = #{examId}
+          and b.verify_status = #{status}
+        order by b.id
+    </select>
 
-	<select id="batchScanner" resultType="string">
-		SELECT DISTINCT t.device
-		FROM sc_batch t
-		WHERE t.exam_id = #{examId}
-	</select>
+    <select id="batchScanner" resultType="string">
+        SELECT DISTINCT t.device
+        FROM sc_batch t
+        WHERE t.exam_id = #{examId}
+    </select>
 
-	<select id="findStudentCountByBatch" resultType="int">
-		SELECT count(distinct bp.student_id)
-		FROM sc_batch_paper bp
-		WHERE bp.batch_id = #{batchId}
-	</select>
+    <select id="findStudentCountByBatch" resultType="int">
+        SELECT count(distinct bp.student_id)
+        FROM sc_batch_paper bp
+        WHERE bp.batch_id = #{batchId}
+    </select>
 
-	<select id="batchDetailListToCheck" resultMap="batchDetailDOMap">
-		select s.id,
-		s.exam_number examNumber,
-		s.seat_number seatNumber,
-		s.student_code studentCode,
-		s.`name` name,
-		s.subject_code subjectCode,
-		ss.name subjectName,
-		bp.assigned assigned,
-		bp.paper_number paperNumber,
-		bp.paper_id paperId,
-		pp.page_index pageIndex,
-		pp.absent absent,
-		pp.sheet_path sheetPath,
-		pp.slice_path slicePath
-		from sc_batch_paper bp
-		left join sc_student s on bp.student_id = s.id
-		left join sc_subject ss on s.subject_code = ss.code and s.exam_id = ss.exam_id
-		left join sc_paper_page pp on bp.paper_id = pp.paper_id
-		where bp.batch_id = #{id}
-		and bp.need_check = #{needCheck}
-		order by bp.student_id, bp.paper_number, pp.page_index
-	</select>
+    <select id="batchDetailListToCheck" resultMap="batchDetailDOMap">
+        select s.id,
+               s.exam_number   examNumber,
+               s.seat_number   seatNumber,
+               s.`name`        name,
+               s.subject_code  subjectCode,
+               ss.name         subjectName,
+               bp.assigned     assigned,
+               bp.paper_number paperNumber,
+               bp.paper_id     paperId,
+               pp.page_index   pageIndex,
+               pp.absent       absent,
+               pp.sheet_path   sheetPath,
+               pp.slice_path   slicePath
+        from sc_batch_paper bp
+                 left join sc_student s on bp.student_id = s.id
+                 left join sc_subject ss on s.subject_code = ss.code and s.exam_id = ss.exam_id
+                 left join sc_paper_page pp on bp.paper_id = pp.paper_id
+        where bp.batch_id = #{id}
+          and bp.need_check = #{needCheck}
+        order by bp.student_id, bp.paper_number, pp.page_index
+    </select>
 
-	<select id="findUnCheck"
-		resultType="cn.com.qmth.scancentral.entity.BatchEntity">
-		select b.id,
-		b.exam_id,
-		b.device,
-		b.package_code,
-		b.scan_count,
-		b.assigned_count,
-		b.status,
-		b.verify_status,
-		b.check_status,
-		b.create_time,
-		b.update_time
-		from sc_batch b
-		where b.exam_id = #{examId}
-		and b.status = #{batchStatus}
-		and b.check_status = #{checkStatus}
-		order by b.id
-	</select>
+    <select id="findUnCheck"
+            resultType="cn.com.qmth.scancentral.entity.BatchEntity">
+        select b.id,
+               b.exam_id,
+               b.device,
+               b.package_code,
+               b.scan_count,
+               b.assigned_count,
+               b.status,
+               b.verify_status,
+               b.check_status,
+               b.create_time,
+               b.update_time
+        from sc_batch b
+        where b.exam_id = #{examId}
+          and b.status = #{batchStatus}
+          and b.check_status = #{checkStatus}
+        order by b.id
+    </select>
 
-	<select id="getHistory"
-		resultType="cn.com.qmth.scancentral.entity.BatchEntity">
-		select b.id,
-		b.exam_id,
-		b.device,
-		b.package_code,
-		b.scan_count,
-		b.assigned_count,
-		b.status,
-		b.verify_status,
-		b.check_status,
-		b.create_time,
-		b.update_time
-		from sc_batch b
-		where b.exam_id = #{examId}
-		and b.check_status = #{status}
-		and b.check_image_user_id = #{userId}
-		<if test="batchId != null">
-        	 <![CDATA[ and b.id < #{batchId} ]]>
-		</if>
-		order by b.id desc
-		limit 1
-	</select>
+    <select id="getHistory"
+            resultType="cn.com.qmth.scancentral.entity.BatchEntity">
+        select b.id,
+        b.exam_id,
+        b.device,
+        b.package_code,
+        b.scan_count,
+        b.assigned_count,
+        b.status,
+        b.verify_status,
+        b.check_status,
+        b.create_time,
+        b.update_time
+        from sc_batch b
+        where b.exam_id = #{examId}
+        and b.check_status = #{status}
+        and b.check_image_user_id = #{userId}
+        <if test="batchId != null">
+            <![CDATA[ and b.id < #{batchId} ]]>
+        </if>
+        order by b.id desc
+        limit 1
+    </select>
 </mapper>

src/main/resources/mapper/PaperMapper.xml

@@ -35,7 +35,6 @@
         select
         bp.student_id studentId,
         s.exam_number examNumber,
-        s.student_code studentCode,
         s.`name` name,
         s.subject_code subjectCode,
         ss.name subjectName,

src/main/resources/mapper/StudentMapper.xml

@@ -60,7 +60,7 @@
         </if>
     </select>
 
-    <select id="absentQuerySummary" resultType="String">
+    <select id="absentQuerySummary" resultType="string">
         select tem.groupName from (
         <include refid="absentInnerQuery"/>
         ) tem
@@ -83,59 +83,6 @@
         <include refid="absentWhereQuery"/>
     </select>
 
-    <select id="queryStudentAnswerGroupCount"
-            resultType="int">
-        select
-        count(*)
-        from sc_student t
-        <if test="query.startTime != null || query.endTime != null">
-            left join sc_student_paper on sp.student_id=t.id
-        </if>
-        <include refid="queryWhereAndOrder"/>
-        <if test="query.startTime != null">
-            and sp.create_time &gt;= #{query.startTime}
-        </if>
-        <if test="query.endTime != null">
-            and sp.create_time &lt;= #{query.endTime}
-        </if>
-        order by t.id
-    </select>
-    <select id="getStudentAnswerCount"
-            resultType="int">
-        select count(*)
-        from sc_student t
-        where t.check_mark = 1
-          and t.exam_id = #{query.examId}
-    </select>
-
-    <select id="getStudentAnswerMarkedList"
-            resultType="cn.com.qmth.scancentral.bean.answergroup.StudnetAnswerGroupMarkedVo">
-        select t.*,
-               s.name subjectName
-        from sc_student t
-                 left join sc_subject s on t.exam_id = s.exam_id and t.subject_code = s.code
-        where t.check_mark = 1
-          and t.exam_id = #{examId}
-    </select>
-
-    <select id="findStudentAnswerTask"
-            resultType="long">
-        select
-        t.id
-        from sc_student t
-        <if test="query.startTime != null || query.endTime != null">
-            left join sc_student_paper on sp.student_id=t.id
-        </if>
-        <include refid="queryWhereAndOrder"/>
-        <if test="query.startTime != null">
-            and sp.create_time &gt;= #{query.startTime}
-        </if>
-        <if test="query.endTime != null">
-            and sp.create_time &lt;= #{query.endTime}
-        </if>
-        order by t.id
-    </select>
-
     <select id="queryPage"
             resultType="cn.com.qmth.scancentral.vo.answerquery.AnswerQueryVo">
         select
@@ -149,7 +96,7 @@
         <include refid="queryWhereAndOrder"/>
         order by t.id
     </select>
-    <select id="querySummary" resultType="String">
+    <select id="querySummary" resultType="string">
         select
         t.exam_number
         from sc_student t
@@ -210,9 +157,6 @@
         <if test="query.examNumber != null and query.examNumber !=''">
             and t.exam_number=#{query.examNumber}
         </if>
-        <if test="query.studentCode != null and query.studentCode !=''">
-            and t.student_code=#{query.studentCode}
-        </if>
         <if test="query.name != null and query.name !=''">
             and t.name=#{query.name}
         </if>
@@ -261,9 +205,6 @@
         <if test="query.examNumber != null and query.examNumber !=''">
             and t.exam_number=#{query.examNumber}
         </if>
-        <if test="query.studentCode != null and query.studentCode !=''">
-            and t.student_code=#{query.studentCode}
-        </if>
         <if test="query.name != null and query.name !=''">
             and t.name=#{query.name}
         </if>
@@ -360,9 +301,6 @@
         <if test="query.examNumber != null and query.examNumber !=''">
             and t.exam_number=#{query.examNumber}
         </if>
-        <if test="query.studentCode != null and query.studentCode !=''">
-            and t.student_code=#{query.studentCode}
-        </if>
         <if test="query.name != null and query.name !=''">
             and t.name=#{query.name}
         </if>
@@ -513,7 +451,7 @@
         from sc_student t
         left join sc_subject s on s.code=t.subject_code and s.exam_id=t.exam_id
         left join (
-            SELECT MAX(id) id,student_id FROM sc_assigned_check_history h GROUP BY student_id
+        SELECT MAX(id) id,student_id FROM sc_assigned_check_history h GROUP BY student_id
         ) m on t.id=m.student_id
         left join sc_assigned_check_history h on h.id=m.id and h.student_id=t.id
         <!--        <if test="query.startTime != null || query.endTime != null">-->
@@ -558,21 +496,20 @@
                                                t.card_number = c.number
                  left join sc_subject s on s.code = t.subject_code and s.exam_id = t.exam_id
         where h.user_id = #{userId}
-        and   h.exam_id = #{examId}
-        and   h.id &lt;= (select id from sc_assigned_check_history where student_id=#{id} and user_id=#{userId} and exam_id = #{examId})
+          and h.exam_id = #{examId}
+          and h.id &lt;= (select id
+                          from sc_assigned_check_history
+                          where student_id = #{id}
+                            and user_id = #{userId}
+                            and exam_id = #{examId})
         order by h.id desc limit #{pageSize}
     </select>
 
     <update id="updateAssignedCheckCount">
         UPDATE sc_student
-        SET assigned_check_count = (
-            SELECT
-                count(1)
-            FROM
-                sc_assigned_check_history h
-            WHERE
-                h.student_id =#{id}
-        )
-        WHERE id =#{id}
+        SET assigned_check_count = (SELECT count(1)
+                                    FROM sc_assigned_check_history h
+                                    WHERE h.student_id = #{id})
+        WHERE id = #{id}
     </update>
 </mapper>