From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改

---
 src/main/java/org/springblade/modules/system/entity/User.java |  108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 108 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 2d6f517..fe64297 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,10 +16,14 @@
  */
 package org.springblade.modules.system.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 
@@ -74,6 +78,8 @@
 	/**
 	 * 生日
 	 */
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date birthday;
 	/**
 	 * 性别
@@ -93,4 +99,106 @@
 	private String postId;
 
 
+	/**
+	 * 身份证
+	 */
+	private String cardid;
+	/**
+	 * 籍贯
+	 */
+	@ApiModelProperty(value = "籍贯")
+	@TableField("nativePlace")
+	private String nativeplace;
+	/**
+	 * 民族
+	 */
+	@ApiModelProperty(value = "民族")
+	private String nation;
+	/**
+	 * 学历
+	 */
+	@ApiModelProperty(value = "学历")
+	private String education;
+	/**
+	 * 政治面貌
+	 */
+	@ApiModelProperty(value = "政治面貌")
+	private String politicaloutlook;
+	/**
+	 * 身高
+	 */
+	@ApiModelProperty(value = "身高")
+	private Float height;
+	/**
+	 * 联系电话
+	 */
+	@ApiModelProperty(value = "联系电话")
+	private String cell;
+	/**
+	 * 邮箱
+	 */
+	@ApiModelProperty(value = "邮箱")
+	private String emails;
+	/**
+	 * 联系地址
+	 */
+	@ApiModelProperty(value = "联系地址")
+	private String address;
+	/**
+	 * 户口所在地
+	 */
+	@ApiModelProperty(value = "户口所在地")
+	private String registered ;
+	/**
+	 * 入职时间
+	 */
+	@ApiModelProperty(value = "入职时间")
+	private String rtime;
+
+
+	private String hold;
+
+	/**
+	 * 行政区域id
+	 */
+	private String jurisdiction;
+	/**
+	 * 保安员证编码
+	 */
+	private String securitynumber;
+
+	/**
+	 * 审查状态
+	 */
+	@TableField("examination_type")
+	private String examinationType;
+
+
+	/**
+	 * 审查明细
+	 */
+	@TableField("examination_mx")
+	private String examinationMx;
+
+	/**
+	 * 是否采集指纹
+	 */
+	private String fingerprint;
+
+	/**
+	 * 是否采集照片
+	 */
+	private String photo;
+
+	/**
+	 * 是否派遣
+	 */
+	private String dispatch;
+
+	/**
+	 * 个人照片，电子照，用于展示保安证，准考证用
+	 */
+	@TableField("my_picture")
+	private String myPicture;
+
 }

--
Gitblit v1.9.3