考试新增字段

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

@@ -173,7 +173,32 @@ public class Exam implements Serializable {
      */
     @Column(name = "show_reject", nullable = false)
     private boolean showReject;
+    
+    /**
+     * 全卷多次复核时不能为同一账号
+     */
+    @Column(name = "inspect_unrepeated", nullable = false)
+    private boolean inspectUnrepeated;
+    
+    /**
+     * 全卷复核时强制试卷拉到底部
+     */
+    @Column(name = "inspect_scroll_bottom", nullable = false)
+    private boolean inspectScrollBottom;
+    
+    /**
+     * 回评卷数
+     */
+    @Column(name = "remark_count")
+    private Integer remarkCount;
+    
+    /**
+     * 是否显示客观分
+     */
+    @Column(name = "show_objective_score", nullable = false)
+    private boolean showObjectiveScore;
 
+    
     public Integer getId() {
         return id;
     }
@@ -418,4 +443,36 @@ public class Exam implements Serializable {
         this.showReject = showReject;
     }
 
+	public Boolean getInspectUnrepeated() {
+		return inspectUnrepeated;
+	}
+
+	public void setInspectUnrepeated(Boolean inspectUnrepeated) {
+		this.inspectUnrepeated = inspectUnrepeated;
+	}
+
+	public Boolean getInspectScrollBottom() {
+		return inspectScrollBottom;
+	}
+
+	public void setInspectScrollBottom(Boolean inspectScrollBottom) {
+		this.inspectScrollBottom = inspectScrollBottom;
+	}
+
+	public Integer getRemarkCount() {
+		return remarkCount;
+	}
+
+	public void setRemarkCount(Integer remarkCount) {
+		this.remarkCount = remarkCount;
+	}
+
+	public Boolean getShowObjectiveScore() {
+		return showObjectiveScore;
+	}
+
+	public void setShowObjectiveScore(Boolean showObjectiveScore) {
+		this.showObjectiveScore = showObjectiveScore;
+	}
+
 }

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

@@ -121,8 +121,8 @@ public class ExamSubject implements Serializable {
     /**
      * 复核轮数
      */
-    @Column(name = "inspector_round", nullable = false)
-    private Integer inspectorRound;
+    @Column(name = "inspect_round", nullable = false)
+    private Integer inspectRound;
 
     /**
      * 大题数量
@@ -414,12 +414,13 @@ public class ExamSubject implements Serializable {
         this.displayQuestionName = displayQuestionName;
     }
 
-	public Integer getInspectorRound() {
-		return inspectorRound;
+	public Integer getInspectRound() {
+		return inspectRound;
 	}
 
-	public void setInspectorRound(Integer inspectorRound) {
-		this.inspectorRound = inspectorRound;
+	public void setInspectRound(Integer inspectRound) {
+		this.inspectRound = inspectRound;
 	}
 
+
 }

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

@@ -56,8 +56,8 @@ public class InspectHistory implements Serializable {
     /**
      * 复核轮数
      */
-    @Column(name = "inspector_round", nullable = false)
-    private Integer inspectorRound;
+    @Column(name = "inspect_round", nullable = false)
+    private Integer inspectRound;
 
     @Transient
     private String inspectorName;
@@ -118,12 +118,13 @@ public class InspectHistory implements Serializable {
         this.inspectorName = inspectorName;
     }
 
-	public Integer getInspectorRound() {
-		return inspectorRound;
+	public Integer getInspectRound() {
+		return inspectRound;
 	}
 
-	public void setInspectorRound(Integer inspectorRound) {
-		this.inspectorRound = inspectorRound;
+	public void setInspectRound(Integer inspectRound) {
+		this.inspectRound = inspectRound;
 	}
 
+
 }

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

@@ -105,6 +105,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                 subject.setCategory(StringUtils.trimToNull(student.getSubjectCategory()));
                 subject.setRemark(StringUtils.trimToNull(student.getSubjectRemark()));
                 subject.setDisplayQuestionName(false);
+                subject.setInspectRound(1);
             } else {
                 subject = subjectMap.get(student.getSubjectCode());
                 subject.setLevel(StringUtils.trimToNull(student.getSubjectLevel()));
@@ -188,6 +189,7 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
             subject.setUploadCount(0);
             subject.setRemark(StringUtils.trimToNull(student.getSubjectRemark()));
             subject.setDisplayQuestionName(false);
+            subject.setInspectRound(1);
             subjectService.save(subject);
         } else {
             student.setSubjectName(subject.getName());

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

@@ -239,6 +239,7 @@ public class DataSyncThread implements Runnable {
         subject.setTotalScore(0d);
         subject.setUploadCount(0);
         subject.setDisplayQuestionName(false);
+        subject.setInspectRound(1);
         subjectService.save(subject);
     }
 

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

@@ -237,6 +237,7 @@ public class OnlineExamThread implements Runnable {
         subject.setTotalScore(0d);
         subject.setUploadCount(0);
         subject.setDisplayQuestionName(false);
+        subject.setInspectRound(1);
         subjectService.save(subject);
         subjectMap.put(subjectCode, subject);
         // 保存question

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

@@ -538,6 +538,7 @@ public class CoreController extends BaseApiController {
             subject.setAutoScroll(exam.isAutoScroll());
             subject.setEnableSplit(exam.isEnableSplit());
             subject.setDisplayQuestionName(false);
+            subject.setInspectRound(1);
         }
         subject.setName(name);
         subject.setRemark(remark);