From 767f47d580e180e2574d9fc4d5379813fd80e5ba Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期四, 04 三月 2021 02:15:40 +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 | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 26 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 44ef679..00630ae 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
@@ -1,22 +1,24 @@
package cc.mrbird.febs.server.hr.entity;
+import java.io.Serializable;
+import java.util.Date;
+
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.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 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 lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
/**
* name:EmpBadrecord
@@ -24,53 +26,78 @@
* description:员工不良记录信息数据表映射实体
*
* @author luoyibo
- * @date 2021-01-24 20:35:55
+ * @date 2021-01-31 11:26:42
* @since JDK1.8
*/
@Data
-@TableName("t_emp_badRecord")
+@TableName("t_emp_badrecord")
+@Excel("员工不良记录")
public class EmpBadRecord implements Serializable {
- private static final long serialVersionUID = 4876027855128737152L;
-
+ private static final long serialVersionUID = 3681849796837950530L;
@FieldInfo(name = "badId", type = "bigint", explain = "不良记录Id")
@TableId(value = "badId")
- private Long badId;
+ private Long badId = 0L;
@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
- private Long empId;
+ private Long empId = 0L;
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
- private String empName;
+ @ExcelField(value = "员工姓名")
+ private String empName = "";
@FieldInfo(name = "empNumb", type = "varchar", explain = "员工编号")
@TableField("empNumb")
- private String empNumb;
+ @ExcelField(value = "员工编号")
+ private String empNumb = "";
+
+ @FieldInfo(name = "sex", type = "varchar", explain = "性别码")
+ @TableField("sex")
+ @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "证件号码")
@TableField("certificateNumb")
- private String certificateNumb;
+ @ExcelField(value = "证件号码")
+ private String certificateNumb = "";
- @FieldInfo(name = "department", type = "varchar", explain = "所属部门")
- @TableField("department")
- private String department;
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @TableField("deptId")
+ private Long deptId = 0L;
+
+ @FieldInfo(name = "deptName", type = "varchar", explain = "部门名称")
+ @TableField("deptName")
+ @ExcelField(value = "部门名称")
+ private String deptName = "";
+
+ @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ @TableField("JobId")
+ private Long jobId = 0L;
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @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")
- private String reporter;
+ @ExcelField(value = "报备人")
+ private String reporter = "";
@FieldInfo(name = "badContent", type = "varchar", explain = "不良记录描述")
@TableField("badContent")
- private String badContent;
+ @ExcelField(value = "不良记录描述")
+ private String badContent = "";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -81,7 +108,7 @@
@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
- private String creator;
+ private String creator = "";
@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@@ -92,18 +119,22 @@
@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
- private String modifier;
+ private String modifier = "";
@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
- private Integer delFlag;
+ private Integer delFlag = 0;
@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
- private Integer version;
+ private Integer version = 0;
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
- private String remark;
+ private String remark = "";
+
+ @TableField(exist = false)
+ private String badDateStr= "";
+
}
\ No newline at end of file
--
Gitblit v1.8.0