From f7dd80d1383f406ba46c417a7c9a95181db94d1a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 16 四月 2024 21:56:36 +0800
Subject: [PATCH] fix: 问题修复 1.数据统计模块中查看合同出错
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 4 ++--
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index a9804e9..a2ceddd 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -388,9 +388,9 @@
@TableField(exist = false)
private String contractStatus = "";
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField(exist = false)
- private Integer contractPeriod = 0;
+ private String contractPeriod;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField(exist = false)
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 e9cb38e..0a88f51 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
@@ -79,7 +79,7 @@
@ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
private Date endDate;
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
private String contractPeriod;
--
Gitblit v1.8.0