From bb3139e62038f3c165253cf5724325092966be78 Mon Sep 17 00:00:00 2001
From: 孔 <1124498879@qq.com>
Date: 星期三, 23 六月 2021 14:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java | 86 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 39 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
index f1aa9dc..654e690 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBadRecord.java
@@ -43,25 +43,55 @@
@TableField("empId")
private Long empId = 0L;
- @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
- @TableField("empName")
- @ExcelField(value = "姓名")
- private String empName = "";
-
@FieldInfo(name = "empNumb", type = "varchar", explain = "编号")
@TableField("empNumb")
@ExcelField(value = "编号")
private String empNumb = "";
-
- @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- private String sex = "";
-
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "empName", type = "varchar", explain = "姓名")
+ @TableField("empName")
+ @ExcelField(value = "姓名")
+ private String empName = "";
+
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
+
+ @FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
+ @TableField("badDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "不良记录日期", writeConverter = TimeConverter.class)
+ private Date badDate;
+
+ @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
+ @TableField("badContent")
+ @ExcelField(value = "不良记录描述")
+ private String badContent = "";
+
+ @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
+ @TableField("reporter")
+ @ExcelField(value = "汇报人")
+ private String reporter = "";
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "备注")
+ @TableField("remark")
+ @ExcelField(value = "备注")
+ private String remark = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
+
+
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
@@ -77,26 +107,9 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
- @ExcelField(value = "岗位名称")
+// @ExcelField(value = "岗位名称")
private String jobName = "";
-
- @FieldInfo(name = "badDate", type = "date", explain = "不良记录日期")
- @TableField("badDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "不良记录日期", writeConverter = TimeConverter.class)
- private Date badDate;
-
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
- @TableField("badContent")
- @ExcelField(value = "不良记录描述")
- private String badContent = "";
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -126,23 +139,18 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
- @FieldInfo(name = "remark", type = "varchar", explain = "备注")
- @TableField("remark")
- private String remark = "";
+
@TableField(exist = false)
private String badDateStr= "";
@FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
@TableField("empStatus")
- @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
+// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
--
Gitblit v1.8.0