From c928e55b2cebb33bbff09920b8fc2df626bafee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8E=9A=E7=A7=AF=E8=96=84=E5=8F=91?= <837944603@qq.com> Date: Thu, 21 Nov 2019 10:15:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/utils/poi/ExcelUtil.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java index a7c76e20..09c9a492 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java @@ -224,7 +224,15 @@ public class ExcelUtil } else { - val = Convert.toStr(val); + String dateFormat = field.getAnnotation(Excel.class).dateFormat(); + if(StringUtils.isNotEmpty(dateFormat)) + { + val=DateUtils.parseDateToStr(dateFormat,(Date) val); + } + else + { + val = Convert.toStr(val); + } } } else if ((Integer.TYPE == fieldType) || (Integer.class == fieldType))