From 5c41dbd69af096235e0392356f05ebc028fe4ee4 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 16 四月 2021 14:45:25 +0800
Subject: [PATCH] 合同期限修改为浮点型
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java | 2 +-
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 2 +-
2 files changed, 2 insertions(+), 2 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 76a9b32..70b621b 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 Integer contractPeriod = 0;
+ private Float contractPeriod = Float.valueOf(0);
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
index ef7aa96..587d849 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpContractInfoServiceImpl.java
@@ -217,7 +217,7 @@
contractInfo.setEndDate(DateUtil.parseDate(list.get(7).toString()));
}
if (StringUtils.isNotBlank(list.get(8).toString())) {
- contractInfo.setContractPeriod(Integer.valueOf(list.get(8).toString()));
+ contractInfo.setContractPeriod(Float.valueOf(list.get(8).toString()));
}
//合同
DicItem dicItem =dicItems.parallelStream().filter(j->StrUtil.equalsIgnoreCase(j.getDicCode(),"contractStatus")&&StrUtil.equals(j.getDicItemName(),list.get(9).toString())).findFirst().orElse(null);
--
Gitblit v1.8.0