From a11f93248da9c54d2ce0f0b4823d8189cc4f587d Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期一, 01 三月 2021 01:15:46 +0800
Subject: [PATCH] 导出根据字段名自动判断日期还是时间
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
index bf459e3..2db64db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/service/impl/EmpOccupationalServiceImpl.java
@@ -184,7 +184,7 @@
empOccupational.setHospitalizatioFlag("未住院".equals(list.get(12).toString()) ? 0 : 1);
}
if (StringUtils.isNotBlank(list.get(13).toString())) {
- empOccupational.setBedNumb(Integer.valueOf(list.get(14).toString()));
+ empOccupational.setBedNumb(list.get(14).toString());
}
if (StringUtils.isNotBlank(list.get(14).toString())) {
empOccupational.setReportTime(DateUtil.parseDate(list.get(14).toString()));
--
Gitblit v1.8.0