..........

examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamStudentEntity.java

@@ -1,6 +1,12 @@
 package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Index;
+import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 import cn.com.qmth.examcloud.web.jpa.JpaEntity;
@@ -24,7 +30,7 @@ public class ExamStudentEntity extends JpaEntity {
 	private static final long serialVersionUID = -4647126917276922968L;
 
 	/**
-	 * 注意:不做业务字段使用
+	 * 不做业务字段使用
 	 */
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -123,21 +129,14 @@ public class ExamStudentEntity extends JpaEntity {
 	private Boolean finished;
 
 	/**
-	 * 正常考试次数
+	 * 已经考试的次数
 	 */
-	private Integer normalExamTimes;
+	private Integer usedNum;
 
 	/**
-	 * 是否重考
+	 * 补加的考试次数
 	 */
-	@Column(name = "is_reexamine")
-	private Boolean isReExamine;
-
-	/**
-	 * 重考是否已完成
-	 */
-	@Column(name = "reexamine_completed")
-	private Boolean reExamineCompleted;
+	private Integer extraNum;
 
 	/**
 	 * 年级
@@ -223,6 +222,14 @@ public class ExamStudentEntity extends JpaEntity {
 		this.courseCode = courseCode;
 	}
 
+	public String getCourseLevel() {
+		return courseLevel;
+	}
+
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
+	}
+
 	public Long getOrgId() {
 		return orgId;
 	}
@@ -279,36 +286,20 @@ public class ExamStudentEntity extends JpaEntity {
 		this.finished = finished;
 	}
 
-	public Integer getNormalExamTimes() {
-		return normalExamTimes;
+	public Integer getUsedNum() {
+		return usedNum;
 	}
 
-	public void setNormalExamTimes(Integer normalExamTimes) {
-		this.normalExamTimes = normalExamTimes;
+	public void setUsedNum(Integer usedNum) {
+		this.usedNum = usedNum;
 	}
 
-	public Boolean getIsReExamine() {
-		return isReExamine;
+	public Integer getExtraNum() {
+		return extraNum;
 	}
 
-	public void setIsReExamine(Boolean isReExamine) {
-		this.isReExamine = isReExamine;
-	}
-
-	public Boolean getReExamineCompleted() {
-		return reExamineCompleted;
-	}
-
-	public void setReExamineCompleted(Boolean reExamineCompleted) {
-		this.reExamineCompleted = reExamineCompleted;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
+	public void setExtraNum(Integer extraNum) {
+		this.extraNum = extraNum;
 	}
 
 	public String getGrade() {