From 63de9a0489ad9264fcd62dc0ac8791a6ec33874b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 73 +++++++++++++++++++++++++++++++++---
1 files changed, 66 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 0e20f03..11f46aa 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
@@ -149,6 +149,13 @@
@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")
private String education = "";
@@ -249,12 +256,12 @@
@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 = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ private String dimissionType;
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -286,7 +293,11 @@
@TableField("version")
@Version
private Integer version = 0;
-
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
+ @TableField("remark")
+ private String remark = "";
+
@TableField(exist = false)
private String ageStr = "";
@@ -296,4 +307,52 @@
@TableField(exist = false)
private String dimissionDateStr= "";
+ @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