From d2aa583807d5e33b549bd626180726d49eaf4562 Mon Sep 17 00:00:00 2001 From: nieqiuqiu Date: Sat, 17 Aug 2019 13:47:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8C=87=E4=BB=A4fd:?= =?UTF-8?q?=E6=94=AF=E6=8C=81java8=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easypoi/util/PoiFunctionUtil.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiFunctionUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiFunctionUtil.java index 61e29c9..e035174 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiFunctionUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/util/PoiFunctionUtil.java @@ -18,7 +18,10 @@ package cn.afterturn.easypoi.util; import java.lang.reflect.Array; import java.text.DecimalFormat; import java.text.SimpleDateFormat; +import java.time.format.DateTimeFormatter; +import java.time.temporal.TemporalAccessor; import java.util.Collection; +import java.util.Date; import java.util.Map; import cn.afterturn.easypoi.exception.excel.ExcelExportException; @@ -98,20 +101,15 @@ public final class PoiFunctionUtil { * @return */ public static String formatDate(Object obj, String format) { - if (obj == null || obj.toString() == "") { + if (obj == null || "".equals(obj.toString())) { return ""; } - SimpleDateFormat dateFormat = null; - if (DAY_STR.equals(format)) { - dateFormat = new SimpleDateFormat(DAY_STR); - } else if (TIME_STR.equals(format)) { - dateFormat = new SimpleDateFormat(TIME_STR); - } else if (TIME__NO_S_STR.equals(format)) { - dateFormat = new SimpleDateFormat(TIME__NO_S_STR); - } else { - dateFormat = new SimpleDateFormat(format); + if (obj instanceof Date || obj instanceof Number) { + return new SimpleDateFormat(format).format(obj); + } else if (obj instanceof TemporalAccessor) { + return DateTimeFormatter.ofPattern(format).format((TemporalAccessor) obj); } - return dateFormat.format(obj); + throw new ExcelExportException("暂不支持的时间类型"); } /**