From 734e2ad327e241fa40e31ff07329f032de689df1 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 19 二月 2021 01:26:07 +0800
Subject: [PATCH] 增加导入员工

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java |  214 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 126 insertions(+), 88 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
index 6804629..5f3336c 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLeaveInfo.java
@@ -1,114 +1,152 @@
 package cc.mrbird.febs.server.hr.entity;
 
-    import java.util.Date;
-    import java.math.BigDecimal;
+import java.io.Serializable;
+import java.util.Date;
+
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.utils.DateDeSerializer;
+import cc.mrbird.febs.common.core.utils.DateSerializer;
+import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
+import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+
+import java.math.BigDecimal;
+
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
-*
-* name:EmpLeaveinfo
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工请假记录数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:29
-* @since JDK1.8
-*/
+ * name:EmpLeaveinfo
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工请假记录数据表映射实体
+ *
+ * @author luoyibo
+ * @date 2021-01-31 11:26:13
+ * @since JDK1.8
+ */
 @Data
 @TableName("t_emp_leaveinfo")
-public class EmpLeaveInfo {
+public class EmpLeaveInfo implements Serializable {
 
-        /**
-        * 请假申请Id
-        */
-            @TableId(value = "leaveId", type = IdType.AUTO)
-            private Long leaveId;
+    private static final long serialVersionUID = -906183894054123470L;
+    @FieldInfo(name = "leaveId", type = "bigint", explain = "请假申请Id")
+    @TableId(value = "leaveId")
+    private Long leaveId = 0L;
 
-        /**
-        * 员工Id
-        */
-            @TableField("empId")
-            private Long empId;
+    @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+    @TableField("empId")
+    private Long empId = 0L;
 
-        /**
-        * 开始时间
-        */
-            @TableField("beginTime")
-            private Date beginTime;
+    @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+    @TableField("empNumb")
+    private String empNumb = "";
 
-        /**
-        * 结束时间
-        */
-            @TableField("endTime")
-            private Date endTime;
+    @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+    @TableField("empName")
+    private String empName = "";
+    
+    @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+    @TableField("empStatus")
+    private String empStatus = "";
 
-        /**
-        * 请假类型
-        */
-            @TableField("leaveType")
-            private String leaveType;
+    @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+    @TableField("sex")
+    private String sex = "";
 
-        /**
-        * 请假天数
-        */
-            @TableField("leaveDay")
-            private BigDecimal leaveDay;
-        /**
-        * 报备人
-        */
-            @TableField("reporter")
-            private String reporter;
+    @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+    @TableField("certificateNumb")
+    private String certificateNumb = "";
 
-        /**
-        * 到岗时间
-        */
-            @TableField("returnDate")
-            private Date returnDate;
+    @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+    @TableField("deptId")
+    private Long deptId = 0L;
 
-        /**
-        * 记录创建时间
-        */
-            @TableField("createTime")
-            private Date createTime;
+    @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+    @TableField("deptName")
+    private String deptName = "";
 
-        /**
-        * 记录创建人
-        */
-            @TableField("creator")
-            private String creator;
+    @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+    @TableField("JobId")
+    private Long jobId = 0L;
 
-        /**
-        * 记录最后更新时间
-        */
-            @TableField("modifyTime")
-            private Date modifyTime;
+    @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+    @TableField("jobName")
+    private String jobName = "";
 
-        /**
-        * 记录最后更新人
-        */
-            @TableField("modifier")
-            private String modifier;
+    @FieldInfo(name = "beginTime", type = "datetime", explain = "开始时间")
+    @TableField("beginTime")
+    @JsonSerialize(using = DateTimeSerializer.class)
+    @JsonDeserialize(using = DateTimeDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date beginTime;
 
-        /**
-        * 记录删除标志。0-未删除 1-已删除,默认0
-        */
-            @TableField("delFlag")
-            private Integer delFlag;
+    @FieldInfo(name = "endTime", type = "datetime", explain = "结束时间")
+    @TableField("endTime")
+    @JsonSerialize(using = DateTimeSerializer.class)
+    @JsonDeserialize(using = DateTimeDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
 
-        /**
-        * 记录版本号,用来进行乐观锁控制
-        */
-            @TableField("version")
-            private Integer version;
+    @FieldInfo(name = "leaveType", type = "varchar", explain = "请假类型")
+    @TableField("leaveType")
+    private String leaveType = "";
 
-        /**
-        * 备注
-        */
-            @TableField("remark")
-            private String remark;
+    @FieldInfo(name = "leaveDay", type = "decimal", explain = "请假天数")
+    @TableField("leaveDay")
+    private BigDecimal leaveDay = BigDecimal.ZERO;
+
+    @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+    @TableField("reporter")
+    private String reporter = "";
+
+    @FieldInfo(name = "returnDate", type = "date", explain = "到岗时间")
+    @TableField("returnDate")
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date returnDate;
+
+    @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+    @TableField("createTime")
+    @JsonSerialize(using = DateTimeSerializer.class)
+    @JsonDeserialize(using = DateTimeDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+    @TableField("creator")
+    private String creator = "";
+
+    @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+    @TableField("modifyTime")
+    @JsonSerialize(using = DateTimeSerializer.class)
+    @JsonDeserialize(using = DateTimeDeserializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date modifyTime;
+
+    @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+    @TableField("modifier")
+    private String modifier = "";
+
+    @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除,默认0")
+    @TableField("delFlag")
+    private Integer delFlag = 0;
+
+    @FieldInfo(name = "version", type = "int", explain = "记录版本号,用来进行乐观锁控制")
+    @TableField("version")
+    @Version
+    private Integer version = 0;
+
+    @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+    @TableField("remark")
+    private String remark = "";
+    
+    @TableField(exist = false)
+	private String leaveDateStr= "";
 
 }
\ No newline at end of file

--
Gitblit v1.8.0