1
0
xiatian 1 жил өмнө
parent
commit
7299c0864d

+ 14 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/ExamSubject.java

@@ -117,6 +117,12 @@ public class ExamSubject implements Serializable {
      */
      */
     @Column(name = "display_question_name", nullable = false)
     @Column(name = "display_question_name", nullable = false)
     private Boolean displayQuestionName;
     private Boolean displayQuestionName;
+    
+    /**
+     * 复核轮数
+     */
+    @Column(name = "inspector_round", nullable = false)
+    private Integer inspectorRound;
 
 
     /**
     /**
      * 大题数量
      * 大题数量
@@ -408,4 +414,12 @@ public class ExamSubject implements Serializable {
         this.displayQuestionName = displayQuestionName;
         this.displayQuestionName = displayQuestionName;
     }
     }
 
 
+	public Integer getInspectorRound() {
+		return inspectorRound;
+	}
+
+	public void setInspectorRound(Integer inspectorRound) {
+		this.inspectorRound = inspectorRound;
+	}
+
 }
 }

+ 14 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/InspectHistory.java

@@ -52,6 +52,12 @@ public class InspectHistory implements Serializable {
      */
      */
     @Column(name = "inspector_id")
     @Column(name = "inspector_id")
     private Integer inspectorId;
     private Integer inspectorId;
+    
+    /**
+     * 复核轮数
+     */
+    @Column(name = "inspector_round", nullable = false)
+    private Integer inspectorRound;
 
 
     @Transient
     @Transient
     private String inspectorName;
     private String inspectorName;
@@ -112,4 +118,12 @@ public class InspectHistory implements Serializable {
         this.inspectorName = inspectorName;
         this.inspectorName = inspectorName;
     }
     }
 
 
+	public Integer getInspectorRound() {
+		return inspectorRound;
+	}
+
+	public void setInspectorRound(Integer inspectorRound) {
+		this.inspectorRound = inspectorRound;
+	}
+
 }
 }

+ 2 - 0
stmms-web/src/main/webapp/sql/stmms_ft.sql

@@ -348,6 +348,7 @@ CREATE TABLE `eb_inspect_history`
 	`inspect_time` 	DATETIME NOT NULL COMMENT '复核时间',
 	`inspect_time` 	DATETIME NOT NULL COMMENT '复核时间',
 	`inspector_id` 	INT (11) DEFAULT NULL COMMENT '复核人ID',
 	`inspector_id` 	INT (11) DEFAULT NULL COMMENT '复核人ID',
 	`student_id` 	INT (11) DEFAULT NULL COMMENT '考生ID',
 	`student_id` 	INT (11) DEFAULT NULL COMMENT '考生ID',
+	`inspector_round` 	INT (11) NOT NULL COMMENT '复核轮数',
 	PRIMARY KEY (`id`),
 	PRIMARY KEY (`id`),
 	KEY `index1` (`student_id`)
 	KEY `index1` (`student_id`)
 ) ENGINE = INNODB 
 ) ENGINE = INNODB 
@@ -380,6 +381,7 @@ CREATE TABLE `eb_exam_subject`
 	`auto_scroll`   	tinyint(1)	DEFAULT NULL COMMENT '评卷提交自动定位',
 	`auto_scroll`   	tinyint(1)	DEFAULT NULL COMMENT '评卷提交自动定位',
 	`enable_split`   	tinyint(1)	DEFAULT NULL COMMENT '自动对切题卡',
 	`enable_split`   	tinyint(1)	DEFAULT NULL COMMENT '自动对切题卡',
 	`display_question_name`   	tinyint(1)	NOT NULL COMMENT '显示题目昵称',
 	`display_question_name`   	tinyint(1)	NOT NULL COMMENT '显示题目昵称',
+	`inspector_round` 	INT (11) NOT NULL COMMENT '复核轮数',
     PRIMARY KEY (`exam_id`, `code`)
     PRIMARY KEY (`exam_id`, `code`)
 ) ENGINE = InnoDB
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='考试科目表';
   DEFAULT CHARSET = utf8mb4 COMMENT ='考试科目表';

+ 4 - 0
stmms-web/src/main/webapp/sql/upgrade/1.3.14.sql

@@ -4,6 +4,10 @@ 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_time`	datetime DEFAULT NULL COMMENT '成绩校验时间';
 ALTER TABLE eb_exam_student ADD COLUMN `score_verify_flagged`	tinyint(1) 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_inspect_history ADD COLUMN `inspector_round` 	int(11) NOT NULL COMMENT '复核轮数';
+
 CREATE TABLE `eb_score_verify` 
 CREATE TABLE `eb_score_verify` 
 (
 (
 	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',
 	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',