From dcd21854d833c96390339603432e5ccaf88ee650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=80=87=C2=B0?= <990130556@qq.com>
Date: Sat, 11 May 2024 16:04:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E8=87=AA=E5=AE=9A=E4=B9=89=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=9C=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E8=A1=A8=E6=A0=BC=E4=B8=AD=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=EF=BC=88=E5=8E=9F=E9=80=BB=E8=BE=91=E5=AF=BC=E5=87=BA=E5=90=8E?=
 =?UTF-8?q?=E7=9A=84=E8=A1=A8=E6=A0=BC=E4=B8=AD=E5=8F=8C=E5=87=BB=E7=A6=BB?=
 =?UTF-8?q?=E5=BC=80=E5=90=8E=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E4=BC=9A?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/core/utils/poi/ExcelUtil.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
index f182fd38..ff46c367 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -941,7 +941,8 @@ public class ExcelUtil<T>
                     CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
                     sheet.addMergedRegion(cellAddress);
                 }
-                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
+                CellStyle cellStyle = styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType()));
+                cell.setCellStyle(cellStyle);
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -950,6 +951,9 @@ public class ExcelUtil<T>
                 String separator = attr.separator();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
+                    // 设置日期格式样式
+                    cellStyle.setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
+                    cell.setCellStyle(cellStyle);
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))