From 6cda44af74fe63b2e276af3228c7bca00dec7ffa Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 20:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index bd0836a..c0ceb85 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -35,11 +35,11 @@
public class EmpInsurance implements Serializable {
private static final long serialVersionUID = 208703298339870887L;
- @FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
+ //@FieldInfo(name = "insuranceId", type = "bigint", explain = "社保Id")
@TableId(value = "insuranceId")
private Long insuranceId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -52,7 +52,7 @@
@TableField("empName")
@ExcelField(value = "员工姓名")
private String empName = "";
-
+
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
@@ -68,7 +68,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -77,7 +77,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -108,44 +108,47 @@
@TableField("reportStatus")
@ExcelField(value = "是否已报告", writeConverterExp = "0=未报告,1=已报告")
private Integer reportStatus = 0;
-
+ @TableField(exist = false)
+ private String reportStatusName ;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
@TableField("applayStatus")
@ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
private Integer applayStatus = 0;
+ @TableField(exist = false)
+ private String applayStatusName ;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
@ExcelField(value = "审核人")
private String auditor = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@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 = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@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 = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -153,8 +156,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
-
+
@TableField(exist = false)
private String applayDateStr;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0