From 40696a10e3d83ac4a37456388e269c230fd6ff7d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 30 Jul 2020 21:42:34 +0800
Subject: [PATCH] excel 导入数字不需要格式化 ，导入允许列和属性个数不一致
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 15 +++++----------
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java | 4 ++--
2 files changed, 7 insertions(+), 12 deletions(-)
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 6e13b2b..0d30159 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
@@ -6,7 +6,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;
@@ -194,7 +193,10 @@
// 设置类的私有字段属性可访问.
field.setAccessible(true);
Integer column = cellMap.get(attr.name());
- fieldsMap.put(column, field);
+ if (column != null)
+ {
+ fieldsMap.put(column, field);
+ }
}
}
for (int i = 1; i < rows; i++)
@@ -829,14 +831,7 @@
}
else
{
- 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)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java
index 4629f30..b8b04f1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java
@@ -37,8 +37,8 @@
Object cacheObj = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj))
{
- List<SysDictData> DictDatas = StringUtils.cast(cacheObj);
- return DictDatas;
+ List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
+ return dictDatas;
}
return null;
}
--
Gitblit v1.9.3