From f961867e0e1ca3251928b1134eb66549a6a89ee3 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 02 三月 2021 23:45:43 +0800
Subject: [PATCH] Merge branch 'lybfix20210302'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
index 80eb819..fa74fa1 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/util/PoiExportExcel.java
@@ -1427,9 +1427,15 @@
try {
if (field.getGenericType().toString().equals("class java.util.Date")) {
Date time = (Date) field.get(exportList.get(i));
- value = field.get(exportList.get(i)) != null
- ? DateUtil.formatDateTime(time).toString()
- : "";
+ if (field.getName().toLowerCase().indexOf("date")!=-1) {
+ value = field.get(exportList.get(i)) != null
+ ? DateUtil.formatDate(time).toString()
+ : "";
+ }else {
+ value = field.get(exportList.get(i)) != null
+ ? DateUtil.formatDateTime(time).toString()
+ : "";
+ }
} else if (field.getGenericType().toString().equals("class java.lang.Boolean")) {
Boolean bool = (Boolean) field.get(exportList.get(i));
value = bool != null && bool == true ? "是" : "否";
--
Gitblit v1.8.0