客观题图数

install/mysql/init/stmms_ft.sql

@@ -311,7 +311,7 @@ CREATE TABLE `eb_exam_student`
     `exam_room`             varchar(32)  DEFAULT NULL COMMENT '考场',
     `remark`                varchar(128) DEFAULT NULL COMMENT '备注',
     `batch_code`            varchar(32)  DEFAULT NULL COMMENT '扫描批次号',
-    `a4_count`           int(11)     NOT NULL COMMENT 'A4图数量',
+    `objective_page_count`           int(11)     NOT NULL COMMENT '客观题图数量',
     `sheet_count`           int(11)     NOT NULL COMMENT '原图数量',
     `slice_count`           int(11)     NOT NULL COMMENT '小图数量',
     `answers`               text COMMENT '客观题识别结果',

install/mysql/upgrade/1.5.1.sql

@@ -6,7 +6,7 @@ ALTER TABLE eb_marker ADD COLUMN `avg_score_na`    double      DEFAULT NULL COMM
 ALTER TABLE eb_marker ADD COLUMN `avg_speed_na`    double      DEFAULT NULL COMMENT '平均时长不含仲裁';
 ALTER TABLE eb_marker ADD COLUMN `stdev_score_na`  double      DEFAULT NULL COMMENT '标准差不含仲裁';
 
-ALTER TABLE eb_exam_student ADD COLUMN `a4_count`   int(11)     NOT NULL DEFAULT 0 COMMENT 'A4图数量';
+ALTER TABLE eb_exam_student ADD COLUMN `objective_page_count`   int(11)     NOT NULL DEFAULT 0 COMMENT '客观题图数量';
 ALTER TABLE eb_exam ADD COLUMN `inspect_round_limit`   	tinyint(1)  NOT NULL DEFAULT 1 COMMENT '全卷复核进度100%时才能再次复核';
 
 update b_privilege set seq=50 where code='exam_paper';

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/dao/ExamStudentDao.java

@@ -130,7 +130,7 @@ public interface ExamStudentDao
             Integer cardNumber);
 
     @Modifying
-    @Query("update ExamStudent s set s.a4Count=0,s.sheetCount=0, s.sliceCount=0, s.answers=null, s.batchCode=null, s.paperType=?2,"
+    @Query("update ExamStudent s set s.objectivePageCount=0,s.sheetCount=0, s.sliceCount=0, s.answers=null, s.batchCode=null, s.paperType=?2,"
             + " s.absent=false, s.upload=false, s.uploadTime=null, s.objectiveScore=0, s.objectiveScoreList=null, "
             + " s.cardNumber=null, s.inspectCount=0 where s.id=?1")
     public int resetScanInfo(Integer id, String paperType);

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamStudent.java

@@ -152,10 +152,10 @@ public class ExamStudent implements Serializable {
     private String batchCode;
 
     /**
-     * A4图数量
+     * 客观题图数量
      */
-    @Column(name = "a4_count", nullable = false)
-    private Integer a4Count;
+    @Column(name = "objective_page_count", nullable = false)
+    private Integer objectivePageCount;
     
     /**
      * 原图数量
@@ -983,12 +983,13 @@ public class ExamStudent implements Serializable {
         this.trial = trial;
     }
 
-	public Integer getA4Count() {
-		return a4Count;
+
+	public Integer getObjectivePageCount() {
+		return objectivePageCount;
 	}
 
-	public void setA4Count(Integer a4Count) {
-		this.a4Count = a4Count;
+	public void setObjectivePageCount(Integer objectivePageCount) {
+		this.objectivePageCount = objectivePageCount;
 	}
 
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -198,7 +198,7 @@ public class StudentController extends BaseExamController {
                 student.setException(false);
                 student.setSliceCount(0);
                 student.setSheetCount(0);
-                student.setA4Count(0);
+                student.setObjectivePageCount(0);
                 student.setObjectiveScore(0d);
                 student.setSubjectiveScore(0d);
                 student.setSubjectiveStatus(SubjectiveStatus.UNMARK);
@@ -293,7 +293,7 @@ public class StudentController extends BaseExamController {
                 student.setException(false);
                 student.setSliceCount(0);
                 student.setSheetCount(0);
-                student.setA4Count(0);
+                student.setObjectivePageCount(0);
                 student.setObjectiveScore(0d);
                 student.setSubjectiveScore(0d);
                 student.setSubjectiveStatus(SubjectiveStatus.UNMARK);
@@ -529,7 +529,7 @@ public class StudentController extends BaseExamController {
                     student.setBatchCode(null);
                     student.setSliceCount(0);
                     student.setSheetCount(0);
-                    student.setA4Count(0);
+                    student.setObjectivePageCount(0);
                     student.setInspectCount(0);
                     if (student.getPaperType() != null && student.getPaperType().matches(PAPER_TYPES_REGEX)) {
                         student.setPaperType(StringUtils.trimToNull(studentVO.getPaperType()));

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/DataSyncThread.java

@@ -191,7 +191,7 @@ public class DataSyncThread implements Runnable {
                         examStudent.setException(false);
                         examStudent.setSliceCount(0);
                         examStudent.setSheetCount(0);
-                        examStudent.setA4Count(0);
+                        examStudent.setObjectivePageCount(0);
                         examStudent.setObjectiveScore(0d);
                         examStudent.setSubjectiveScore(0d);
                         examStudent.setSubjectiveStatus(SubjectiveStatus.UNMARK);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/thread/OnlineExamThread.java

@@ -184,7 +184,7 @@ public class OnlineExamThread implements Runnable {
         examStudent.setException(false);
         examStudent.setSliceCount(0);
         examStudent.setSheetCount(0);
-        examStudent.setA4Count(0);
+        examStudent.setObjectivePageCount(0);
         examStudent.setObjectiveScore(0d);
         examStudent.setSubjectiveScore(0d);
         examStudent.setSubjectiveStatus(SubjectiveStatus.UNMARK);

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -235,7 +235,7 @@ public class CoreController extends BaseApiController {
             student.setBreach(false);
             student.setSliceCount(0);
             student.setSheetCount(0);
-            student.setA4Count(0);
+            student.setObjectivePageCount(0);
             student.setObjectiveScore(0d);
             student.setSubjectiveScore(0d);
             student.setInspectCount(0);

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ScanController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import cn.com.qmth.stmms.api.dto.RefixStudent;
 import cn.com.qmth.stmms.api.exception.ApiException;
 import cn.com.qmth.stmms.api.utils.ScanStudentA4Parameter;
+import cn.com.qmth.stmms.api.utils.ScanStudentObjectivePageCountParameter;
 import cn.com.qmth.stmms.api.utils.ScanStudentParameter;
 import cn.com.qmth.stmms.biz.exam.model.CheckStudent;
 import cn.com.qmth.stmms.biz.exam.model.Exam;
@@ -73,12 +74,12 @@ public class ScanController extends BaseApiController {
      * @param scStudentParameter
      * @return
      */
-    @Logging(menu = "扫描端-考生识别上传(含A4数量)", type = LogType.UPDATE)
+    @Logging(menu = "扫描端-考生客观题页数上传", type = LogType.UPDATE)
     @RoleRequire({ Role.SCHOOL_ADMIN, Role.SCANNER, Role.SCAN_ADMIN })
-    @RequestMapping(value = "/student/a4/{examId}", method = RequestMethod.POST)
+    @RequestMapping(value = "/student/objective/page/count/{examId}", method = RequestMethod.POST)
     @ResponseBody
-    public JSONArray saveStudentWithA4(HttpServletRequest request, @PathVariable Integer examId,
-            @RequestBody ScanStudentA4Parameter[] scStudentParameter) {
+    public JSONArray saveStudentstudentObjectivePageCount(HttpServletRequest request, @PathVariable Integer examId,
+            @RequestBody ScanStudentObjectivePageCountParameter[] scStudentParameter) {
         ApiUser user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
         JSONArray array = new JSONArray();
@@ -88,37 +89,37 @@ public class ScanController extends BaseApiController {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         if (scStudentParameter != null && scStudentParameter.length > 0) {
-            for (ScanStudentA4Parameter sc : scStudentParameter) {
+            for (ScanStudentObjectivePageCountParameter sc : scStudentParameter) {
                 ExamStudent student = studentService.findByExamIdAndExamNumber(examId, sc.getExamNumber());
-                if (student != null) {
-                    student.setUpload(true);
-                    student.setAbsent(sc.isAbsent());
-                    student.setAnswers(sc.getAnswers().toUpperCase());
-                    student.setBatchCode(sc.getBatchCode());
-                    student.setSliceCount(sc.getSliceCount());
-                    student.setSheetCount(sc.getSheetCount());
-                    student.setA4Count(sc.getA4Count());
-                    if (sc.getPaperType() != null) {
-                        if (sc.getPaperType().matches(PAPER_TYPES_REGEX)) {
-                            student.setPaperType(sc.getPaperType());
-                        } else {
-                            continue;
-                        }
-                    }
-                    student.setCardNumber(sc.getCardNumber());
-                    // 同步更新评卷任务
-                    if (saveUploadStudent(student)) {
-                        JSONObject obj = new JSONObject();
-                        obj.accumulate("examNumber", student.getExamNumber());
-                        obj.accumulate("uploadTime", DateUtils.formatDateTime(student.getUploadTime()));
-                        array.add(obj);
-                        // 增加人工审核数据
-                        if (sc.isManual()) {
-                            checkStudentService.save(new CheckStudent(student.getId(), examId,
-                                    student.getSubjectCode(), CheckType.MANUAL));
-                        }
-                    }
-                }
+////                if (student != null) {
+////                    student.setUpload(true);
+////                    student.setAbsent(sc.isAbsent());
+////                    student.setAnswers(sc.getAnswers().toUpperCase());
+////                    student.setBatchCode(sc.getBatchCode());
+////                    student.setSliceCount(sc.getSliceCount());
+////                    student.setSheetCount(sc.getSheetCount());
+////                    student.setObjectivePageCount(sc.getA4Count());
+////                    if (sc.getPaperType() != null) {
+////                        if (sc.getPaperType().matches(PAPER_TYPES_REGEX)) {
+////                            student.setPaperType(sc.getPaperType());
+////                        } else {
+////                            continue;
+////                        }
+////                    }
+////                    student.setCardNumber(sc.getCardNumber());
+////                    // 同步更新评卷任务
+////                    if (saveUploadStudent(student)) {
+////                        JSONObject obj = new JSONObject();
+////                        obj.accumulate("examNumber", student.getExamNumber());
+////                        obj.accumulate("uploadTime", DateUtils.formatDateTime(student.getUploadTime()));
+////                        array.add(obj);
+////                        // 增加人工审核数据
+////                        if (sc.isManual()) {
+////                            checkStudentService.save(new CheckStudent(student.getId(), examId,
+////                                    student.getSubjectCode(), CheckType.MANUAL));
+////                        }
+////                    }
+//                }
             }
         }
         return array;

stmms-web/src/main/java/cn/com/qmth/stmms/api/utils/ScanStudentObjectivePageCountParameter.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.stmms.api.utils;
+
+public class ScanStudentObjectivePageCountParameter {
+
+    private String examNumber;
+    
+    private int objectivePageCount;
+    
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+	public int getObjectivePageCount() {
+		return objectivePageCount;
+	}
+
+	public void setObjectivePageCount(int objectivePageCount) {
+		this.objectivePageCount = objectivePageCount;
+	}
+
+
+}