From 55095a50b5df8b6207bc92fbcbc065c2bcd4ba7d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期四, 23 七月 2020 21:25:02 +0800
Subject: [PATCH] !48 ExcelUtil 功能优化 Merge pull request !48 from soulCoke/master
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 2d6ed8c..51dbcd7 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
@@ -8,7 +8,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.math.BigDecimal;
-import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
@@ -18,6 +17,7 @@
import java.util.Map;
import java.util.UUID;
import java.util.stream.Collectors;
+
import org.apache.poi.hssf.usermodel.HSSFDateUtil;
import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.Cell;
@@ -41,6 +41,7 @@
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
import com.ruoyi.common.annotation.Excel.Type;
@@ -200,7 +201,9 @@
// 璁剧疆绫荤殑绉佹湁瀛楁灞炴�у彲璁块棶.
field.setAccessible(true);
Integer column = cellMap.get(attr.name());
- fieldsMap.put(column, field);
+ if(column !=null ) { // 瀛楁鍦╡xcel 涓病鏈夛紝閭ｄ箞灏变笉闇�瑕佽缃��
+ fieldsMap.put(column, field);
+ }
}
}
for (int i = 1; i < rows; i++)
@@ -894,14 +897,15 @@
}
else
{
- if ((Double) val % 1 > 0)
- {
- val = new DecimalFormat("0.00").format(val);
- }
- else
- {
- val = new DecimalFormat("0").format(val);
- }
+ /* if ((Double) val % 1 > 0)
+ {
+ val = new DecimalFormat("0.00").format(val);
+ }
+ else
+ {
+ val = new DecimalFormat("0").format(val);
+ }*/
+ val = new BigDecimal(val.toString()); // 瀵煎叆鐨勬暟鎹繚璇佸師姹佸師鍛筹紝涓嶅仛澶勭悊
}
}
else if (cell.getCellTypeEnum() == CellType.STRING)
--
Gitblit v1.9.3