merge

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

@@ -227,6 +227,10 @@ CREATE TABLE `eb_exam`
     `auto_scroll`   	tinyint(1) 		NOT NULL COMMENT '评卷提交自动定位',
 	`enable_split`   	tinyint(1)  	NOT NULL COMMENT '自动对切题卡',
 	`show_reject`   	tinyint(1)  	NOT NULL COMMENT '显示打回前原分值',
+	`inspect_unrepeated`   	tinyint(1)  	NOT NULL COMMENT '全卷多次复核时不能为同一账号',
+	`inspect_scroll_bottom`   	tinyint(1)  	NOT NULL COMMENT '全卷复核时强制试卷拉到底部',
+	`remark_count`   	int(11)  	DEFAULT NULL COMMENT '回评卷数',
+	`show_objective_score`   	tinyint(1)  	NOT NULL COMMENT '是否显示客观分',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`school_id`, `code`)
 ) ENGINE = InnoDB
@@ -348,9 +352,9 @@ CREATE TABLE `eb_inspect_history`
 	`inspect_time` 	DATETIME NOT NULL COMMENT '复核时间',
 	`inspector_id` 	INT (11) DEFAULT NULL COMMENT '复核人ID',
 	`student_id` 	INT (11) DEFAULT NULL COMMENT '考生ID',
-	`inspector_round` 	INT (11) NOT NULL COMMENT '复核轮数',
+	`inspect_round` 	INT (11) NOT NULL COMMENT '复核轮数',
 	PRIMARY KEY (`id`),
-	KEY `index1` (`student_id`)
+	UNIQUE KEY `index1` (`student_id`, `inspect_round`)
 ) ENGINE = INNODB 
 	DEFAULT CHARSET = utf8mb4 COMMENT = '复核记录表';
 
@@ -381,7 +385,7 @@ CREATE TABLE `eb_exam_subject`
 	`auto_scroll`   	tinyint(1)	DEFAULT NULL COMMENT '评卷提交自动定位',
 	`enable_split`   	tinyint(1)	DEFAULT NULL COMMENT '自动对切题卡',
 	`display_question_name`   	tinyint(1)	NOT NULL COMMENT '显示题目昵称',
-	`inspector_round` 	INT (11) NOT NULL COMMENT '复核轮数',
+	`inspect_round` 	INT (11) NOT NULL COMMENT '复核轮数',
     PRIMARY KEY (`exam_id`, `code`)
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='考试科目表';
@@ -1107,13 +1111,14 @@ DROP TABLE IF EXISTS `eb_answer_card`;
 CREATE TABLE `eb_answer_card` 
 (
     `exam_id`			int(11)     NOT NULL COMMENT '考试ID',
-    `subject_code`		varchar(32) DEFAULT NULL COMMENT '科目代码',
+    `code`				varchar(64) DEFAULT NULL COMMENT '混扫代码',
     `number`			int(11)     NOT NULL COMMENT '序号',
   	`need_adapte`		tinyint(1)  DEFAULT NULL COMMENT '强制适配',
   	`paper_count`		int(11) 	DEFAULT NULL COMMENT '试卷数量',
 	`single_page`		tinyint(1)	DEFAULT NULL COMMENT '单页模式',
 	`source`			varchar(16) NOT NULL COMMENT '来源',
 	`md5`				varchar(255) DEFAULT NULL COMMENT '文件md5',
+	`dpi`				int(11) 	 DEFAULT NULL COMMENT 'dpi',
 	`slice_config` 		text 		 DEFAULT NULL COMMENT '裁切配置',
 	`parameter`			varchar(255) DEFAULT NULL COMMENT '其他属性',
 	`remark`			varchar(255) DEFAULT NULL COMMENT '备注',
@@ -1147,3 +1152,19 @@ CREATE TABLE `eb_score_verify_detail`
   UNIQUE KEY `index1` (`score_verify_id`,`student_id`)
 )  ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验结果';
+
+  
+# Dump of table sc_answer_card_subject
+# ------------------------------------------------------------
+
+DROP TABLE IF EXISTS `sc_answer_card_subject`;
+CREATE TABLE `sc_answer_card_subject` 
+(
+	`id`           		int(11)     	NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `exam_id`			int(11)     	NOT NULL COMMENT '考试ID',
+    `card_number`		int(11)     	NOT NULL COMMENT '卡格式号',
+  	`subjectCode`		varchar(128)	NOT NULL COMMENT '科目代码',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subjectCode`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='卡格式科目关联关系';

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

@@ -4,9 +4,16 @@ ALTER TABLE eb_exam_student ADD COLUMN `score_verify_user`	int(11) DEFAULT NULL
 ALTER TABLE eb_exam_student ADD COLUMN `score_verify_time`	datetime DEFAULT NULL COMMENT '成绩校验时间';
 ALTER TABLE eb_exam_student ADD COLUMN `score_verify_flagged`	tinyint(1) DEFAULT NULL COMMENT '成绩校验标记结果';
 
-ALTER TABLE eb_exam_subject ADD COLUMN `inspector_round` 	int(11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
+ALTER TABLE eb_exam_subject ADD COLUMN `inspect_round` 	int(11) NOT NULL DEFAULT 1 COMMENT '复核轮数';
 
-ALTER TABLE eb_inspect_history ADD COLUMN `inspector_round` 	int(11) NOT NULL COMMENT '复核轮数';
+ALTER TABLE eb_inspect_history ADD COLUMN `inspect_round` 	int(11) NOT NULL COMMENT '复核轮数';
+ALTER TABLE eb_inspect_history DROP INDEX index1;
+ALTER TABLE eb_inspect_history ADD UNIQUE INDEX index1(`student_id`, `inspect_round`);
+
+ALTER TABLE eb_exam ADD COLUMN `inspect_unrepeated`	tinyint(1) NOT NULL DEFAULT 0 COMMENT '全卷多次复核时不能为同一账号';
+ALTER TABLE eb_exam ADD COLUMN `inspect_scroll_bottom`	tinyint(1) NOT NULL DEFAULT 0 COMMENT '全卷复核时强制试卷拉到底部';
+ALTER TABLE eb_exam ADD COLUMN `remark_count`	int(11) DEFAULT NULL COMMENT '回评卷数';
+ALTER TABLE eb_exam ADD COLUMN `show_objective_score`	tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否显示客观分';
 
 CREATE TABLE `eb_score_verify` 
 (
@@ -30,4 +37,19 @@ CREATE TABLE `eb_score_verify_detail`
   PRIMARY KEY (`id`),
   UNIQUE KEY `index1` (`score_verify_id`,`student_id`)
 )  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验结果';
+  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验结果';
+  
+
+ALTER TABLE sc_answer_card ADD COLUMN `dpi` 	int(11) NOT NULL COMMENT 'dpi';
+ALTER TABLE sc_answer_card ADD COLUMN `code` 	varchar(64) NOT NULL COMMENT '混扫代码';
+CREATE TABLE `sc_answer_card_subject` 
+(
+	`id`           		int(11)     	NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `exam_id`			int(11)     	NOT NULL COMMENT '考试ID',
+    `card_number`		int(11)     	NOT NULL COMMENT '卡格式号',
+  	`subjectCode`		varchar(128)	NOT NULL COMMENT '科目代码',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`exam_id`,`card_number`,`subjectCode`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='卡格式科目关联关系';
+