From 90afab64346a321306872b4e9f0f21bb1dae92f8 Mon Sep 17 00:00:00 2001
From: nadirvishun <clzhl_2004@163.com>
Date: Sun, 19 Dec 2021 03:35:57 +0000
Subject: [PATCH] =?UTF-8?q?update=20ruoyi-common/src/main/java/com/ruoyi/c?=
 =?UTF-8?q?ommon/utils/poi/ExcelUtil.java.=20=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E8=B5=8B=E5=80=BC=E7=9A=84=E9=94=99=E8=AF=AF=E5=8F=8A?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/common/utils/poi/ExcelUtil.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 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 847600fc0..839d1b575 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
@@ -830,7 +830,8 @@ public class ExcelUtil<T>
                 {
                     String valueStr = (((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString();
                     //增加如果设置cellType是数值格式，则设置自定义小数点的格式
-                    if (Excel.ColumnType.NUMERIC == attr.cellType()) {
+                    if (Excel.ColumnType.NUMERIC == attr.cellType()) 
+                    {
                         //需要新建个样式，直接从styles.get("data")会被后续的覆盖掉
                         CellStyle cellStyle = wb.createCellStyle();
                         cellStyle.cloneStyleFrom(styles.get("data"));
@@ -839,15 +840,13 @@ public class ExcelUtil<T>
                         cellStyle.setDataFormat(df.getFormat(precision));
                         cell.setCellStyle(cellStyle);
                         cell.setCellValue(Double.parseDouble(valueStr));
-                    } else {
+                    } 
+                    else 
+                    {
                         //否则还是字符串导出
                         cell.setCellValue(valueStr);
                     }
-                } else {
-                    // 设置列类型
-                    setCellVo(value, attr, cell);
-                }
-                }
+                } 
                 else if (!attr.handler().equals(ExcelHandlerAdapter.class))
                 {
                     cell.setCellValue(dataFormatHandlerAdapter(value, attr));