Merge remote-tracking branch 'origin/dev' into dev

themis-business/src/main/java/com/qmth/themis/business/entity/TEExam.java

@@ -1,12 +1,13 @@
 package com.qmth.themis.business.entity;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.util.Date;
-
 /**
  * @Description: 考试批次
  * @Param:
@@ -186,6 +187,10 @@ public class TEExam extends BaseEntity {
     @TableField(value = "enable_break")
     private Integer enableBreak;
 
+    @ApiModelProperty(value = "客观题给分策略,0:全对给分,1: 漏选给一半分")
+    @TableField(value = "objective_score_policy")
+    private Integer objectiveScorePolicy;
+    
     public Integer getEnableBreak() {
         return enableBreak;
     }
@@ -526,4 +531,14 @@ public class TEExam extends BaseEntity {
         this.showObjectiveScore = showObjectiveScore;
     }
 
+	public Integer getObjectiveScorePolicy() {
+		return objectiveScorePolicy;
+	}
+
+	public void setObjectiveScorePolicy(Integer objectiveScorePolicy) {
+		this.objectiveScorePolicy = objectiveScorePolicy;
+	}
+    
+    
+
 }

themis-business/src/main/java/com/qmth/themis/business/enums/ObjectiveScorePolicyEnum.java

@@ -0,0 +1,30 @@
+package com.qmth.themis.business.enums;
+
+/**客观题给分策略
+ * @Description: 
+ * @Author: xiatian
+ * @Date: 2020-07-29
+ */
+public enum ObjectiveScorePolicyEnum {
+
+    /**
+     * 全对给分
+     */
+	EQUAL("全对给分"),
+
+    /**
+     * 漏选给一半分
+     */
+	PARTIAL("漏选给一半分");
+
+    private String title;
+
+    private ObjectiveScorePolicyEnum(String title) {
+        this.title = title;
+    }
+
+	public String getTitle() {
+		return title;
+	}
+    
+}

themis-business/src/main/resources/db/init.sql

@@ -581,6 +581,7 @@ CREATE TABLE `t_e_exam` (
   `update_id` bigint DEFAULT NULL COMMENT '更新人id',
   `enable_short_code` tinyint DEFAULT NULL COMMENT '是否启用开考口令，0：不启用，1：启用',
   `enable_break` tinyint DEFAULT NULL COMMENT '是否允许断点续考，0：不允许，1：允许',
+  `objective_score_policy` tinyint DEFAULT NULL COMMENT '客观题给分策略',
   PRIMARY KEY (`id`),
   UNIQUE KEY `t_e_exam_orgId_code_Idx` (`org_id`,`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试批次';