From 9595e097ecd74bcc35a8ef633c6749f5d3d2b19a Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 17 三月 2021 00:06:49 +0800
Subject: [PATCH] 修改bug
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 2f5927c..7f6d7b2 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -35,22 +35,22 @@
public class EmpContractInfo implements Serializable {
private static final long serialVersionUID = 4152214737054224645L;
- @FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
+ //@FieldInfo(name = "contractId", type = "bigint", explain = "合同Id")
@TableId(value = "contractId")
private Long contractId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
+ @FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
- @ExcelField(value = "员工编号")
+ @ExcelField(value = "编号")
private String empNumb = "";
- @FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
- @ExcelField(value = "员工姓名")
+ @ExcelField(value = "姓名")
private String empName = "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@@ -58,9 +58,9 @@
@ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
- @FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
+ @FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
- @ExcelField(value = "证件号码")
+ @ExcelField(value = "身份证号码")
private String certificateNumb = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@@ -68,16 +68,15 @@
@ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
- @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门(护卫点)")
@TableField("deptName")
- @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;
@@ -130,33 +129,33 @@
@ExcelField(value = "备注")
private String remark = "";
- @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;
@@ -171,4 +170,9 @@
@TableField(exist = false)
private String contractStatusName = "";
-}
\ No newline at end of file
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+}
--
Gitblit v1.8.0