From 1e0c5d41572d5774d589c87250a0626081068d6f Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 03 二月 2021 10:04:25 +0800
Subject: [PATCH] feat(人力和系统微服务): 补传代码
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 1bca92c..f0f7f9c 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
@@ -47,7 +47,7 @@
private Long deptId = 0L;
@FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
- @TableField("deptName")
+ @TableField(exist = false)
private String deptName = "";
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@@ -58,9 +58,13 @@
@TableField("empName")
private String empName = "";
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码，使用国标性别性别码")
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别")
@TableField("sex")
private String sex = "";
+
+ @FieldInfo(name = "sexName", type = "varchar", explain = "性别")
+ @TableField(exist = false)
+ private String sexName = "";
@FieldInfo(name = "jobId", type = "bigint", explain = "岗位Id")
@TableField("jobId")
@@ -86,6 +90,10 @@
@TableField("nation")
private String nation = "";
+ @FieldInfo(name = "nationName", type = "varchar", explain = "民族")
+ @TableField(exist = false)
+ private String nationName = "";
+
@FieldInfo(name = "certificateValidity", type = "date", explain = "证件有效期")
@TableField("certificateValidity")
@JsonSerialize(using = DateSerializer.class)
@@ -96,6 +104,10 @@
@FieldInfo(name = "marriage", type = "varchar", explain = "婚姻状况")
@TableField("marriage")
private String marriage = "";
+
+ @FieldInfo(name = "marriageName", type = "varchar", explain = "婚姻状况")
+ @TableField(exist = false)
+ private String marriageName = "";
@FieldInfo(name = "age", type = "tinyint", explain = "年龄")
@TableField("age")
@@ -116,6 +128,10 @@
@TableField("politics")
private String politics = "";
+ @FieldInfo(name = "politicsName", type = "varchar", explain = "政治面貌")
+ @TableField(exist = false)
+ private String politicsName = "";
+
@FieldInfo(name = "entryDate", type = "date", explain = "入职日期")
@TableField("entryDate")
@JsonSerialize(using = DateSerializer.class)
@@ -127,6 +143,10 @@
@TableField("education")
private String education = "";
+ @FieldInfo(name = "educationName", type = "varchar", explain = "最高学历")
+ @TableField(exist = false)
+ private String educationName = "";
+
@FieldInfo(name = "seniority", type = "tinyint", explain = "入司工龄")
@TableField("seniority")
private Integer seniority = 0;
@@ -134,6 +154,10 @@
@FieldInfo(name = "nativePlace", type = "varchar", explain = "籍贯")
@TableField("nativePlace")
private String nativePlace = "";
+
+ @FieldInfo(name = "nativePlaceName", type = "varchar", explain = "籍贯")
+ @TableField(exist = false)
+ private String nativePlaceName = "";
@FieldInfo(name = "censusAddress", type = "varchar", explain = "户籍地址")
@TableField("censusAddress")
@@ -199,6 +223,11 @@
@TableField("certificateList")
private String certificateList = "";
+ @FieldInfo(name = "certificateListName", type = "varchar", explain = "相关证件")
+ @TableField(exist = false)
+ private String certificateListName = "";
+
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
--
Gitblit v1.8.0