From d43c0f42bece03a0d2e81c4c135e803eda75cbcf Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:03:03 +0800
Subject: [PATCH] 首页的查询，以及性别字段的不必填
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 69 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 7 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 0f94667..111cf3c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -49,7 +49,7 @@
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField(exist = false)
+ @TableField("deptName")
private String deptName = "";
@NotBlank(message = "{required}")
@@ -148,6 +148,13 @@
@JsonDeserialize(using = DateDeSerializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
+
+ @FieldInfo(name = "dimissionDate", type = "date", explain = "离职日期")
+ @TableField("dimissionDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date dimissionDate;
@FieldInfo(name = "education", type = "varchar", explain = "最高学历")
@TableField("education")
@@ -249,12 +256,7 @@
@TableField("empStatus")
private String empStatus = "";
- @FieldInfo(name = "dimissionDate", type = "datetime", explain = "离职日期")
- @TableField("dimissionDate")
- @JsonSerialize(using = DateTimeSerializer.class)
- @JsonDeserialize(using = DateTimeDeserializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date dimissionDate;
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -296,4 +298,57 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ private String dimissionType = "";
+
+ @TableField(exist = false)
+ private String dimissionTypeName= "";
+
+
+ @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date beginDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
+
+ @FieldInfo(name = "contractStatus", type = "varchar", explain = "合同状态")
+ @TableField(exist = false)
+ private String contractStatus = "";
+
+ @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @TableField(exist = false)
+ private Integer contractPeriod = 0;
+
+ @FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
+ @TableField(exist = false)
+ private String transactor = "";
+
+ @FieldInfo(name = "signingDate", type = "date", explain = "合同签订日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date signingDate;
+
+ @FieldInfo(name = "applayDate", type = "date", explain = "辞职申请日期")
+ @TableField(exist = false)
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date applayDate;
+
+ @TableField(exist = false)
+ private String reason;
+ @TableField(exist = false)
+ private String reporter;
+
}
\ No newline at end of file
--
Gitblit v1.8.0