From 69c6aad0e4923d11f3aeb308aa90d7931dfa65cb Mon Sep 17 00:00:00 2001 From: Sxile <3440626@qq.com> Date: Fri, 22 Nov 2019 17:53:17 +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 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) 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 43775fe..c950d1f 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,8 +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)) {