From 80f9a92f46ee4155944dccbe0bbf953ddcab7546 Mon Sep 17 00:00:00 2001 From: hupanpan Date: Fri, 15 Nov 2019 15:05:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0CellUtil=20Instant=E4=B8=8EDa?= =?UTF-8?q?te=E4=B8=80=E6=A0=B7=E7=9A=84format=20=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/hutool/poi/excel/cell/CellUtil.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java index 386253764..f388a2431 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/cell/CellUtil.java @@ -17,6 +17,7 @@ import org.apache.poi.ss.util.RegionUtil; import org.apache.poi.ss.util.SheetUtil; import java.math.BigDecimal; +import java.time.Instant; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -159,6 +160,11 @@ public class CellUtil { cell.setCellStyle(styleSet.getCellStyleForDate()); } cell.setCellValue((Date) value); + } else if (value instanceof Instant) { + if (null != styleSet && null != styleSet.getCellStyleForDate()) { + cell.setCellStyle(styleSet.getCellStyleForDate()); + } + cell.setCellValue(Date.from((Instant) value)); } else if (value instanceof Calendar) { cell.setCellValue((Calendar) value); } else if (value instanceof Boolean) {