Merge remote-tracking branch 'origin/dev_1.3.14' into dev_1.3.14

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

@@ -0,0 +1,11 @@
+package cn.com.qmth.stmms.biz.exam.dao;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerify;
+
+public interface ScoreVerifyDao
+		extends PagingAndSortingRepository<ScoreVerify, Integer>, JpaSpecificationExecutor<ScoreVerify> {
+
+}

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

@@ -0,0 +1,11 @@
+package cn.com.qmth.stmms.biz.exam.dao;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerifyDetail;
+
+public interface ScoreVerifyDetailDao
+		extends PagingAndSortingRepository<ScoreVerifyDetail, Integer>, JpaSpecificationExecutor<ScoreVerifyDetail> {
+
+}

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

@@ -282,6 +282,26 @@ public class ExamStudent implements Serializable {
 
     @Column(name = "inspect_count", nullable = true)
     private Integer inspectCount;
+    
+    /**
+     * 成绩校验人ID
+     */
+    @Column(name = "score_check_user")
+    private Integer scoreCheckUser;
+    
+    /**
+     * 成绩校验时间
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "score_check_time")
+    private Date scoreCheckTime;
+    
+    /**
+     * 成绩校验标记结果
+     */
+    @Column(name = "score_check_flagged")
+    private Boolean scoreCheckFlagged;
+    
 
     /**
      * 科目备注信息

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

@@ -0,0 +1,98 @@
+package cn.com.qmth.stmms.biz.exam.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * 成绩校验
+ * 
+ * @author Administrator
+ *
+ */
+@Entity
+@Table(name = "eb_score_verify")
+public class ScoreVerify implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8782399485127136556L;
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+
+	/**
+	 * 考试id
+	 */
+	@Column(name = "exam_id", nullable = false)
+	private Integer examId;
+
+	/**
+	 * 校验人id
+	 */
+	@Column(name = "user_id", nullable = false)
+	private Integer userId;
+
+	/**
+	 * 查询条件json
+	 */
+	@Column(name = "params", nullable = false)
+	private String params;
+
+	/**
+	 * 创建时间
+	 */
+	@Temporal(TemporalType.DATE)
+	@Column(name = "create_time", nullable = false)
+	private Date createTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getExamId() {
+		return examId;
+	}
+
+	public void setExamId(Integer examId) {
+		this.examId = examId;
+	}
+
+	public Integer getUserId() {
+		return userId;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	public String getParams() {
+		return params;
+	}
+
+	public void setParams(String params) {
+		this.params = params;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+}

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

@@ -0,0 +1,95 @@
+package cn.com.qmth.stmms.biz.exam.model;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**成绩校验明细
+ * @author Administrator 
+ */
+@Entity
+@Table(name = "eb_score_verify_detail")
+public class ScoreVerifyDetail implements Serializable {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8782399485127136556L;
+
+	@Id
+	@GeneratedValue
+	private Integer id;
+
+	/**
+	 * 成绩校验查询条件id
+	 */
+	@Column(name = "score_verify_id", nullable = false)
+	private Integer scoreVerifyId;
+
+	/**
+	 * 考生id
+	 */
+	@Column(name = "student_id", nullable = false)
+	private Integer studentId;
+
+	/**
+	 * 是否被标记
+	 */
+	@Column(name = "flagged", nullable = false)
+	private Boolean flagged;
+
+	/**
+	 * 校验时间
+	 */
+	@Temporal(TemporalType.DATE)
+	@Column(name = "create_time", nullable = false)
+	private Date createTime;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getScoreVerifyId() {
+		return scoreVerifyId;
+	}
+
+	public void setScoreVerifyId(Integer scoreVerifyId) {
+		this.scoreVerifyId = scoreVerifyId;
+	}
+
+	public Integer getStudentId() {
+		return studentId;
+	}
+
+	public void setStudentId(Integer studentId) {
+		this.studentId = studentId;
+	}
+
+	public Boolean getFlagged() {
+		return flagged;
+	}
+
+	public void setFlagged(Boolean flagged) {
+		this.flagged = flagged;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+}

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

@@ -0,0 +1,5 @@
+package cn.com.qmth.stmms.biz.exam.service;
+
+public interface ScoreVerifyDetailService {
+
+}

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

@@ -0,0 +1,4 @@
+package cn.com.qmth.stmms.biz.exam.service;
+
+public interface ScoreVerifyService {
+}

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

@@ -0,0 +1,17 @@
+package cn.com.qmth.stmms.biz.exam.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.exam.dao.ScoreVerifyDetailDao;
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerifyDetail;
+import cn.com.qmth.stmms.biz.exam.service.ScoreVerifyDetailService;
+
+@Service
+public class ScoreVerifyDetailServiceImpl extends BaseQueryService<ScoreVerifyDetail> implements ScoreVerifyDetailService {
+
+	@Autowired
+	private ScoreVerifyDetailDao scoreVerifyDetailDao;
+
+}

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

@@ -0,0 +1,18 @@
+package cn.com.qmth.stmms.biz.exam.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import cn.com.qmth.stmms.biz.common.BaseQueryService;
+import cn.com.qmth.stmms.biz.exam.dao.ScoreVerifyDao;
+import cn.com.qmth.stmms.biz.exam.model.ScoreVerify;
+import cn.com.qmth.stmms.biz.exam.service.ScoreVerifyService;
+
+@Service
+public class ScoreVerifyServiceImpl extends BaseQueryService<ScoreVerify> implements ScoreVerifyService {
+
+    @Autowired
+    private ScoreVerifyDao scoreVerifyDao;
+
+
+}

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

@@ -0,0 +1,12 @@
+package cn.com.qmth.stmms.admin.exam;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/admin/exam/score/verify")
+public class ScoreVerifyController extends BaseExamController {
+
+    protected static Logger log = LoggerFactory.getLogger(ScoreVerifyController.class);
+
+}

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

@@ -325,6 +325,9 @@ CREATE TABLE `eb_exam_student`
     `class_name`            varchar(64) NOT NULL COMMENT '班级',
     `teacher`               varchar(64) NOT NULL COMMENT '任课老师',
     `card_number` 			int (11) 	DEFAULT NULL COMMENT '题卡号',
+    `score_verify_user` 			int (11) 	DEFAULT NULL COMMENT '成绩校验人ID',
+    `score_verify_time`          datetime     DEFAULT NULL COMMENT '成绩校验时间',
+    `score_verify_flagged`             tinyint(1)  DEFAULT NULL COMMENT '成绩校验标记结果',
     PRIMARY KEY (`id`),
     UNIQUE KEY `index1` (`exam_id`, `exam_number`),
     UNIQUE KEY `index2` (`exam_id`, `secret_number`),
@@ -1116,3 +1119,29 @@ CREATE TABLE `eb_answer_card`
   PRIMARY KEY (`exam_id`,`number`)
 )  ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4 COMMENT ='题卡卡格式表';
+
+DROP TABLE IF EXISTS `eb_score_verify`;  
+CREATE TABLE `eb_score_verify` 
+(
+	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `exam_id`			int(11)     NOT NULL COMMENT '考试ID',
+  	`user_id`		int(11) 	NOT NULL COMMENT '操作人ID',
+	`params` 		text 		 NOT NULL COMMENT '查询条件',
+    `create_time`  		datetime     NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`exam_id`,`user_id`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验查询条件';
+  
+DROP TABLE IF EXISTS `eb_score_verify_detail`;  
+CREATE TABLE `eb_score_verify_detail` 
+(
+	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `score_verify_id`			int(11)     NOT NULL COMMENT '成绩校验查询条件ID',
+    `student_id`			int(11)     NOT NULL COMMENT '考生ID',
+  	`flagged`		tinyint(1)  NOT NULL COMMENT '是否被标记',
+  	`create_time`  		datetime     NOT NULL COMMENT '校验时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`score_verify_id`,`student_id`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验结果';

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

@@ -0,0 +1,29 @@
+USE `stmms_ft`;
+
+ALTER TABLE eb_exam_student ADD COLUMN `score_verify_user`	int(11) DEFAULT NULL COMMENT '成绩校验人ID';
+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 '成绩校验标记结果';
+
+CREATE TABLE `eb_score_verify` 
+(
+	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `exam_id`			int(11)     NOT NULL COMMENT '考试ID',
+  	`user_id`		int(11) 	NOT NULL COMMENT '操作人ID',
+	`params` 		text 		 NOT NULL COMMENT '查询条件',
+    `create_time`  		datetime     NOT NULL COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`exam_id`,`user_id`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验查询条件';
+  
+CREATE TABLE `eb_score_verify_detail` 
+(
+	`id`           int(11)     NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `score_verify_id`			int(11)     NOT NULL COMMENT '成绩校验查询条件ID',
+    `student_id`			int(11)     NOT NULL COMMENT '考生ID',
+  	`flagged`		tinyint(1)  NOT NULL COMMENT '是否被标记',
+  	`create_time`  		datetime     NOT NULL COMMENT '校验时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index1` (`score_verify_id`,`student_id`)
+)  ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='成绩校验结果';