Joburgess 5 年 前
コミット
4098917f71

+ 12 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/entity/ExamRegistration.java

@@ -1,6 +1,7 @@
 package com.keao.edu.user.entity;
 
 import com.keao.edu.auth.api.entity.SysUser;
+import com.keao.edu.user.enums.StudentRegistrationStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -50,6 +51,9 @@ public class ExamRegistration {
 	@ApiModelProperty(value = "证件号")
 	private String cardNo;
 
+	@ApiModelProperty(value = "报名状态")
+	private StudentRegistrationStatusEnum status;
+
 	private java.util.Date createTime;
 
 	private java.util.Date updateTime;
@@ -64,6 +68,14 @@ public class ExamRegistration {
 		return this.id;
 	}
 
+	public StudentRegistrationStatusEnum getStatus() {
+		return status;
+	}
+
+	public void setStatus(StudentRegistrationStatusEnum status) {
+		this.status = status;
+	}
+
 	public SysUser getSysUser() {
 		return sysUser;
 	}

+ 40 - 0
edu-user/edu-user-server/src/main/java/com/keao/edu/user/enums/StudentRegistrationStatusEnum.java

@@ -0,0 +1,40 @@
+package com.keao.edu.user.enums;
+
+import com.keao.edu.common.enums.BaseEnum;
+
+/**
+ * @Author Joburgess
+ * @Date 2020.06.23
+ */
+public enum  StudentRegistrationStatusEnum implements BaseEnum<String, StudentRegistrationStatusEnum> {
+    AUDIT_WAIT("AUDIT_WAIT", "等待审核"),
+    AUDIT_PASS("AUDIT_PASS","通过"),
+    AUDIT_REJECT("AUDIT_REJECT", "拒绝"),
+    REFUNDED("REFUNDED", "已退款");
+
+    private String code;
+
+    private String msg;
+
+    StudentRegistrationStatusEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return null;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+}

+ 6 - 2
edu-user/edu-user-server/src/main/resources/config/mybatis/ExamRegistrationMapper.xml

@@ -21,6 +21,7 @@
 		<result column="adviser_name_" property="adviserName" />
 		<result column="adviser_phone_" property="adviserPhone" />
 		<result column="card_no_" property="cardNo" />
+		<result column="status_" property="status" typeHandler="com.keao.edu.common.dal.CustomEnumTypeHandler"/>
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="tenant_id_" property="tenantId" />
@@ -38,8 +39,8 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.keao.edu.user.entity.ExamRegistration" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO exam_registration (id_,examination_basic_id_,student_id_,agency_id_,subject_id_,level_,song_json_,last_exam_level_,last_exam_certificate_url_,adviser_name_,adviser_phone_,card_no_,create_time_,update_time_,tenant_id_)
-		VALUES(#{id},#{examinationBasicId},#{studentId},#{agencyId},#{subjectId},#{level},#{songJson},#{lastExamLevel},#{lastExamCertificateUrl},#{adviserName},#{adviserPhone},#{cardNo},NOW(), NOW(),#{tenantId})
+		INSERT INTO exam_registration (id_,examination_basic_id_,student_id_,agency_id_,subject_id_,level_,song_json_,last_exam_level_,last_exam_certificate_url_,adviser_name_,adviser_phone_,card_no_,status_,create_time_,update_time_,tenant_id_)
+		VALUES(#{id},#{examinationBasicId},#{studentId},#{agencyId},#{subjectId},#{level},#{songJson},#{lastExamLevel},#{lastExamCertificateUrl},#{adviserName},#{adviserPhone},#{cardNo},#{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler},NOW(), NOW(),#{tenantId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -85,6 +86,9 @@
 			<if test="cardNo!=null">
 				card_no_ =#{cardNo},
 			</if>
+			<if test="status!=null">
+				status_ = #{status,typeHandler=com.keao.edu.common.dal.CustomEnumTypeHandler}
+			</if>
 				update_time_ = NOW()
 		</set> WHERE id_ = #{id}
 	</update>