From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序
---
src/main/java/org/springblade/modules/system/entity/User.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 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 c523951..56e2b2e 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -18,10 +18,12 @@
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;
@@ -76,6 +78,8 @@
/**
* 生日
*/
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 性别
@@ -121,7 +125,7 @@
* 身高
*/
@ApiModelProperty(value = "身高")
- private Float height;
+ private String height;
/**
* 联系电话
*/
@@ -146,6 +150,8 @@
* 入职时间
*/
@ApiModelProperty(value = "入职时间")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private String rtime;
private String hold;
private String jurisdiction;
@@ -168,6 +174,54 @@
*/
@TableField("my_picture")
private String myPicture;
+ /**
+ * 是否缴社保
+ */
+ private String soil;
+ /**
+ * 健康状态 0：健康 1：良好 2：一般 3：较差
+ */
+ private String healstats;
+
+ /**
+ * 发证日期（保安证）
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @TableField("paper_time")
+ private Date paperTime;
+
+ /**
+ * 离职原因
+ */
+ @TableField("reason_for_leav")
+ private String reasonForLeav;
+
+ private String holdv;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date holdvtime;
+
+
+ /**
+ * 是否缴纳保险 0：是 1：否
+ */
+ private Integer insurance;
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("audit_time")
+ private Date auditTime;
+ /**
+ * 押运人员设备编号
+ */
+ @TableField("equipment_code")
+ private String equipmentCode;
+ private String types;
+
}
--
Gitblit v1.9.3