From 4fd6fc409a6527b13932d45f061a12579763e961 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 四月 2024 19:49:40 +0800
Subject: [PATCH] fix: 问题修复 1.备注板块打开时提示绑定错误 2.合同板块不能保存问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index bcdc4bd..b9be76b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -47,6 +47,16 @@
@TableField("empNumb")
@ExcelField(value = "编号")
private String empNumb = "";
+
+ @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+ @ExcelField(value = "部门(护卫点)")
+ @TableField(exist = false)
+ private String allDeptName = "";
+
+ @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
+ @TableField("jobName")
+ @ExcelField(value = "岗位")
+ private String jobName = "";
@FieldInfo(name = "empName", type = "varchar", explain = "姓名")
@TableField("empName")
@@ -55,13 +65,38 @@
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
- @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
private String sex = "";
@FieldInfo(name = "certificateNumb", type = "varchar", explain = "身份证号码")
@TableField("certificateNumb")
@ExcelField(value = "身份证号码")
private String certificateNumb = "";
+
+ @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
+ @TableField("applayDate")
+ @JsonSerialize(using = DateSerializer.class)
+ @JsonDeserialize(using = DateDeSerializer.class)
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @ExcelField(value = "辞职申请日期", writeConverter = TimeConverter.class)
+ private Date applayDate;
+
+ @FieldInfo(name = "reason", type = "varchar", explain = "事由")
+ @TableField("reason")
+ @ExcelField(value = "辞职事由")
+ private String reason = "";
+
+ @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 = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
@@ -75,28 +110,10 @@
@TableField("JobId")
private Long jobId = 0L;
- @FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
- @TableField("jobName")
- @ExcelField(value = "岗位名称")
- private String jobName = "";
- @FieldInfo(name = "applayDate", type = "date", explain = "申请日期")
- @TableField("applayDate")
- @JsonSerialize(using = DateSerializer.class)
- @JsonDeserialize(using = DateDeSerializer.class)
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ExcelField(value = "申请日期", writeConverter = TimeConverter.class)
- private Date applayDate;
+
- @FieldInfo(name = "reporter", type = "varchar", explain = "报备人")
- @TableField("reporter")
- @ExcelField(value = "报备人")
- private String reporter = "";
-
- @FieldInfo(name = "reason", type = "varchar", explain = "事由")
- @TableField("reason")
- @ExcelField(value = "事由")
- private String reason = "";
+
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -126,12 +143,8 @@
//@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 applayDateStr;
@@ -139,8 +152,5 @@
@TableField(exist = false)
private String empStatus;
- @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
- @ExcelField(value = "部门(护卫点)")
- @TableField(exist = false)
- private String allDeptName = "";
+
}
--
Gitblit v1.8.0