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/EmpContractInfo.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 d7cb3e0..e9cb38e 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
@@ -82,7 +82,7 @@
@FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
- private Float contractPeriod = Float.valueOf(0);
+ private String contractPeriod;
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
@@ -101,8 +101,9 @@
private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
- @TableField("sex")
+// @TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
+ @TableField(exist = false)
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@@ -136,7 +137,7 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
-// @ExcelField(value = "备注")
+ @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -170,13 +171,20 @@
// @Version
private Integer version = 0;
+ @TableField("diffDay")
+ private Integer diffDay = 0;
+
+ @TableField("remindFlag")
+ private Integer remindFlag = 0;
+
@TableField(exist = false)
private String signingDateStr = "";
@TableField(exist = false)
private String endDateStr = "";
-
+ @TableField(exist = false)
+ private String diffLabel = "";
--
Gitblit v1.8.0