From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java | 199 +++++++++++++++++++++++++++++++------------------
1 files changed, 124 insertions(+), 75 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
index e9f9ae9..72948e2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpWorkExperience.java
@@ -1,96 +1,145 @@
package cc.mrbird.febs.server.hr.entity;
- import java.util.Date;
-import lombok.Data;
-import com.baomidou.mybatisplus.annotation.IdType;
+import cc.mrbird.febs.common.core.annotation.FieldInfo;
+import cc.mrbird.febs.common.core.converter.TimeConverter;
+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.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.wuwenze.poi.annotation.Excel;
+import com.wuwenze.poi.annotation.ExcelField;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
-*
-* name:EmpWorkexperinece
-* package:cc.mrbird.febs.server.hr.controller
-* description:员工工作经历数据表映射实体
-*
-* @author luoyibo
-* @date 2021-01-24 20:35:04
-* @since JDK1.8
-*/
+ * name:EmpWorkexperience
+ * package:cc.mrbird.febs.server.hr.controller
+ * description:员工工作经历数据表映射实体
+ *
+ * @author luoyibo
+ * @date 2021-01-28 12:33:31
+ * @since JDK1.8
+ */
@Data
-@TableName("t_emp_workexperinece")
-public class EmpWorkExperience {
+@TableName("t_emp_workExperience")
+@Excel("员工工作经历")
+public class EmpWorkExperience implements Serializable {
- /**
- * 工作经历Id
- */
- @TableId(value = "workExpreienceId", type = IdType.AUTO)
- private Long workExpreienceId;
+ @FieldInfo(name = "workExperienceId", type = "bigint", explain = "工作经历Id")
+ @TableId(value = "workExperienceId")
+ private Long workExperienceId;
- /**
- * 员工Id
- */
- @TableField("empId")
- private Long empId;
+ @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ @TableField("empId")
+ private Long empId;
- /**
- * 工作单位
- */
- @TableField("workUnit")
- private String workUnit;
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @TableField("empNumb")
+ @ExcelField(value = "员工编号")
+ private String empNumb;
- /**
- * 开始日期
- */
- @TableField("beginDate")
- private Date beginDate;
+ @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @TableField("empName")
+ @ExcelField(value = "员工姓名")
+ private String empName;
- /**
- * 结束日期
- */
- @TableField("endDate")
- private Date endDate;
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+ private String empStatus = "";
- /**
- * 主要工作内容
- */
- @TableField("jobContent")
- private String jobContent;
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @TableField("certificateNumb")
+ @ExcelField(value = "证件号码")
+ private String certificateNumb;
- /**
- * 记录创建时间
- */
- @TableField("createTime")
- private Date createTime;
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
+ @TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex;
- /**
- * 记录创建人
- */
- @TableField("creator")
- private String creator;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
- /**
- * 记录最后更新时间
- */
- @TableField("modifyTime")
- private Date modifyTime;
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ @ExcelField(value = "部门名称")
+ private String deptName = "";
- /**
- * 记录最后更新人
- */
- @TableField("modifier")
- private String modifier;
+ @FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
+ @TableField("jobId")
+ private Long jobId = 0L;
- /**
- * 记录删除标志。0-未删除 1-已删除，默认0
- */
- @TableField("delFlag")
- private Integer delFlag;
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位名称")
+ private String jobName = "";
- /**
- * 记录版本号，用来进行乐观锁控制
- */
- @TableField("version")
- private Integer version;
+ @FieldInfo(name = "workUnit", type = "varchar", explain = "工作单位")
+ @TableField("workUnit")
+ @ExcelField(value = "工作单位")
+ private String workUnit;
-}
\ No newline at end of file
+ @FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
+ @TableField("beginDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "开始日期", writeConverter = TimeConverter.class)
+ private Date beginDate;
+
+ @FieldInfo(name = "endDate", type = "date", explain = "结束日期")
+ @TableField("endDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "结束日期", writeConverter = TimeConverter.class)
+ private Date endDate;
+
+ @FieldInfo(name = "jobContent", type = "varchar", explain = "主要工作内容")
+ @TableField("jobContent")
+ @ExcelField(value = "主要工作内容")
+ private String jobContent;
+
+ @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;
+
+ @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ @TableField("version")
+ @Version
+ private Integer version;
+
+}
--
Gitblit v1.8.0