update

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamQuestionServiceImpl.java

@@ -109,8 +109,13 @@ public class ExamQuestionServiceImpl extends BaseQueryService<ExamQuestion> impl
     public List<ExamQuestion> findByExamAndSubjectAndObjectiveGroupByNumber(Integer examId, String subjectCode,
             boolean objective) {
         List<String> paperTypeList = this.getPaperType(examId, subjectCode);
-        List<ExamQuestion> list = this.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, objective,
-                paperTypeList.get(0));
+        List<ExamQuestion> list = new ArrayList<ExamQuestion>();
+        if (paperTypeList.isEmpty()) {
+            list = this.findByExamAndSubjectAndObjective(examId, subjectCode, objective);
+        } else {
+            list = this.findByExamAndSubjectAndObjectiveAndPaperType(examId, subjectCode, objective,
+                    paperTypeList.get(0));
+        }
         return questionSort(list);
     }
 

stmms-web/src/main/webapp/sql/college_scan_multi.sql

@@ -30,9 +30,9 @@ DROP TABLE IF EXISTS `append_scan`;
 CREATE TABLE `append_scan` (
   `save_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP,
   `exam_id` int(11) NOT NULL,
+  `exam_site` varchar(50) DEFAULT NULL,
   `student_code` varchar(30) DEFAULT NULL,
   `exam_number` varchar(30) NOT NULL,
-  `exam_site` varchar(50) DEFAULT NULL,
   `subject_code` varchar(30) DEFAULT NULL,
   `sheet_count` int(5) DEFAULT NULL,
   `slice_count` int(5) DEFAULT NULL,
@@ -278,6 +278,7 @@ CREATE TABLE `ocrdata` (
   `CampusCode` varchar(5) DEFAULT NULL,
   `CampusName` varchar(30) DEFAULT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `SubjectCode` varchar(30) DEFAULT NULL,
   `SubjectName` varchar(50) DEFAULT NULL,
   `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -344,6 +345,7 @@ CREATE TABLE `ocrdata_history` (
   `CampusCode` varchar(5) DEFAULT NULL,
   `CampusName` varchar(30) DEFAULT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `SubjectCode` varchar(30) DEFAULT NULL,
   `SubjectName` varchar(50) DEFAULT NULL,
   `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -439,6 +441,7 @@ CREATE TABLE `sign_page` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `page_no` varchar(11) NOT NULL,
   `xh` int(10) NOT NULL,
   `Card_DefCount` int(3) DEFAULT NULL,
@@ -495,6 +498,88 @@ CREATE TABLE `task_master` (
   PRIMARY KEY (`exam_id`,`task_id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
+-- ----------------------------
+-- Table structure for tmpabs_sign_page
+-- ----------------------------
+DROP TABLE IF EXISTS `tmpabs_sign_page`;
+CREATE TABLE `tmpabs_sign_page` (
+  `exam_id` int(11) unsigned NOT NULL,
+  `exam_site` varchar(200) NOT NULL DEFAULT '',
+  `exam_number` varchar(64) NOT NULL DEFAULT '',
+  `scan_page` varchar(16) NOT NULL DEFAULT '',
+  `pageCount` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`exam_id`,`exam_number`),
+  KEY `exam_site` (`exam_site`),
+  KEY `exam_number` (`exam_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for tmp_barcodenotexists
+-- ----------------------------
+DROP TABLE IF EXISTS `tmp_barcodenotexists`;
+CREATE TABLE `tmp_barcodenotexists` (
+  `exam_id` int(11) NOT NULL,
+  `exam_site` varchar(32) DEFAULT NULL COMMENT '考点',
+  `exam_room` varchar(32) DEFAULT NULL COMMENT '考场',
+  `student_code` varchar(64) NOT NULL COMMENT '学号',
+  `name` varchar(64) NOT NULL COMMENT '姓名',
+  `subject_code` varchar(32) NOT NULL COMMENT '科目代码',
+  `subject_name` varchar(32) NOT NULL COMMENT '科目名称',
+  `exam_number` varchar(64) NOT NULL COMMENT '准考证号',
+  `Absent_status` varchar(30) DEFAULT NULL,
+  KEY `subject_code` (`subject_code`),
+  KEY `student_code` (`student_code`),
+  KEY `exam_number` (`exam_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for tmp_check_student
+-- ----------------------------
+DROP TABLE IF EXISTS `tmp_check_student`;
+CREATE TABLE `tmp_check_student` (
+  `exam_id` int(11) NOT NULL,
+  `exam_site` varchar(150) DEFAULT NULL,
+  `student_code` varchar(50) DEFAULT NULL,
+  `exam_number` varchar(128) NOT NULL,
+  `name` varchar(64) DEFAULT NULL,
+  `subject_code` varchar(32) DEFAULT NULL,
+  `subject_name` varchar(100) DEFAULT NULL,
+  `is_upload` tinyint(1) DEFAULT NULL,
+  `scan_misspage_page` varchar(128) DEFAULT NULL,
+  `ocrdata_scan_count` int(3) DEFAULT NULL,
+  `ocrdata_scan_page` varchar(128) DEFAULT NULL,
+  `sign_scan_count` int(3) DEFAULT NULL,
+  `sign_scan_page` varchar(128) DEFAULT NULL,
+  `card_def_count` int(3) DEFAULT NULL,
+  `repeat_status` int(11) DEFAULT NULL,
+  PRIMARY KEY (`exam_id`,`exam_number`),
+  KEY `exam_site` (`exam_id`,`exam_site`),
+  KEY `ocrdata_scan_page` (`exam_id`,`ocrdata_scan_page`),
+  KEY `sign_scan_page` (`exam_id`,`sign_scan_page`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for tmp_sign_count
+-- ----------------------------
+DROP TABLE IF EXISTS `tmp_sign_count`;
+CREATE TABLE `tmp_sign_count` (
+  `exam_id` int(11) unsigned NOT NULL,
+  `exam_number` varchar(64) NOT NULL DEFAULT '',
+  `scan_count` int(11) NOT NULL,
+  PRIMARY KEY (`exam_id`,`exam_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Table structure for tmp_sign_page
+-- ----------------------------
+DROP TABLE IF EXISTS `tmp_sign_page`;
+CREATE TABLE `tmp_sign_page` (
+  `exam_id` int(11) unsigned NOT NULL,
+  `exam_number` varchar(64) NOT NULL DEFAULT '',
+  `scan_page` varchar(16) NOT NULL DEFAULT '',
+  PRIMARY KEY (`exam_id`,`exam_number`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
 -- ----------------------------
 -- Table structure for upload_file_list
 -- ----------------------------

stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -498,6 +498,7 @@ CREATE TABLE `sign_page` (
   `exam_id` int(11) NOT NULL,
   `exam_number` varchar(30) NOT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `page_no` varchar(11) NOT NULL,
   `xh` int(10) NOT NULL,
   `Card_DefCount` int(3) DEFAULT NULL,
@@ -566,6 +567,7 @@ CREATE TABLE `ocrdata` (
   `CampusCode` varchar(5) DEFAULT NULL,
   `CampusName` varchar(30) DEFAULT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `SubjectCode` varchar(30) DEFAULT NULL,
   `SubjectName` varchar(50) DEFAULT NULL,
   `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -750,6 +752,7 @@ CREATE TABLE `ocrdata_history` (
   `CampusCode` varchar(5) DEFAULT NULL,
   `CampusName` varchar(30) DEFAULT NULL,
   `exam_site` varchar(50) DEFAULT NULL,
+  `college` varchar(64) DEFAULT NULL,
   `SubjectCode` varchar(30) DEFAULT NULL,
   `SubjectName` varchar(50) DEFAULT NULL,
   `OCRTime` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,