wangwei 7 年之前
父节点
当前提交
eda9fcf1d0

+ 69 - 91
examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamStudent.java

@@ -9,7 +9,6 @@ import javax.persistence.Table;
 import javax.persistence.Transient;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
-import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 import cn.com.qmth.examcloud.commons.web.jpa.JpaEntity;
 
 
 /**
 /**
@@ -189,13 +188,6 @@ public class ExamStudent extends JpaEntity {
 	 */
 	 */
 	private String packageCode;
 	private String packageCode;
 
 
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public ExamStudent() {
-	}
-
 	public Long getId() {
 	public Long getId() {
 		return id;
 		return id;
 	}
 	}
@@ -220,6 +212,38 @@ public class ExamStudent extends JpaEntity {
 		this.exam = exam;
 		this.exam = exam;
 	}
 	}
 
 
+	public Long getRootOrgId() {
+		return rootOrgId;
+	}
+
+	public void setRootOrgId(Long rootOrgId) {
+		this.rootOrgId = rootOrgId;
+	}
+
+	public Long getOrgId() {
+		return orgId;
+	}
+
+	public void setOrgId(Long orgId) {
+		this.orgId = orgId;
+	}
+
+	public String getOrgCode() {
+		return orgCode;
+	}
+
+	public void setOrgCode(String orgCode) {
+		this.orgCode = orgCode;
+	}
+
+	public String getOrgName() {
+		return orgName;
+	}
+
+	public void setOrgName(String orgName) {
+		this.orgName = orgName;
+	}
+
 	public String getStudentCode() {
 	public String getStudentCode() {
 		return studentCode;
 		return studentCode;
 	}
 	}
@@ -260,56 +284,12 @@ public class ExamStudent extends JpaEntity {
 		this.courseName = courseName;
 		this.courseName = courseName;
 	}
 	}
 
 
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getGrade() {
-		return grade;
-	}
-
-	public void setGrade(String grade) {
-		this.grade = grade;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
+	public String getCourseLevel() {
+		return courseLevel;
 	}
 	}
 
 
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
+	public void setCourseLevel(String courseLevel) {
+		this.courseLevel = courseLevel;
 	}
 	}
 
 
 	public String getPaperType() {
 	public String getPaperType() {
@@ -320,14 +300,6 @@ public class ExamStudent extends JpaEntity {
 		this.paperType = paperType;
 		this.paperType = paperType;
 	}
 	}
 
 
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
 	public Boolean getDegree() {
 	public Boolean getDegree() {
 		return degree;
 		return degree;
 	}
 	}
@@ -336,6 +308,22 @@ public class ExamStudent extends JpaEntity {
 		this.degree = degree;
 		this.degree = degree;
 	}
 	}
 
 
+	public String getSpecialtyName() {
+		return specialtyName;
+	}
+
+	public void setSpecialtyName(String specialtyName) {
+		this.specialtyName = specialtyName;
+	}
+
+	public String getSpecialtyCode() {
+		return specialtyCode;
+	}
+
+	public void setSpecialtyCode(String specialtyCode) {
+		this.specialtyCode = specialtyCode;
+	}
+
 	public Boolean getRepair() {
 	public Boolean getRepair() {
 		return repair;
 		return repair;
 	}
 	}
@@ -344,6 +332,14 @@ public class ExamStudent extends JpaEntity {
 		this.repair = repair;
 		this.repair = repair;
 	}
 	}
 
 
+	public String getGrade() {
+		return grade;
+	}
+
+	public void setGrade(String grade) {
+		this.grade = grade;
+	}
+
 	public Boolean getGraduated() {
 	public Boolean getGraduated() {
 		return graduated;
 		return graduated;
 	}
 	}
@@ -352,6 +348,14 @@ public class ExamStudent extends JpaEntity {
 		this.graduated = graduated;
 		this.graduated = graduated;
 	}
 	}
 
 
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 	public Boolean getFinished() {
 	public Boolean getFinished() {
 		return finished;
 		return finished;
 	}
 	}
@@ -376,14 +380,6 @@ public class ExamStudent extends JpaEntity {
 		this.examSite = examSite;
 		this.examSite = examSite;
 	}
 	}
 
 
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
 	public String getInfoCollector() {
 	public String getInfoCollector() {
 		return infoCollector;
 		return infoCollector;
 	}
 	}
@@ -400,18 +396,7 @@ public class ExamStudent extends JpaEntity {
 		this.phone = phone;
 		this.phone = phone;
 	}
 	}
 
 
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-
 	public Integer getNormalExamTimes() {
 	public Integer getNormalExamTimes() {
-		if (normalExamTimes == null) {
-			return 0;
-		}
 		return normalExamTimes;
 		return normalExamTimes;
 	}
 	}
 
 
@@ -451,14 +436,6 @@ public class ExamStudent extends JpaEntity {
 		this.reexamineCompleted = reexamineCompleted;
 		this.reexamineCompleted = reexamineCompleted;
 	}
 	}
 
 
-	public Boolean getReexamine() {
-		return isReexamine;
-	}
-
-	public void setReexamine(Boolean reexamine) {
-		isReexamine = reexamine;
-	}
-
 	public String getExamBeginTime() {
 	public String getExamBeginTime() {
 		return examBeginTime;
 		return examBeginTime;
 	}
 	}
@@ -490,4 +467,5 @@ public class ExamStudent extends JpaEntity {
 	public void setPackageCode(String packageCode) {
 	public void setPackageCode(String packageCode) {
 		this.packageCode = packageCode;
 		this.packageCode = packageCode;
 	}
 	}
+
 }
 }