zmyYYDS
/
wit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

excel 导入数字不需要格式化 ，导入允许列和属性个数不一致

zmy
RuoYi 2020-07-30 21:42:34 +08:00
parent 9bfe3e5328
commit 40696a10e3
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
View File

@ -6,7 +6,6 @@ import java.io.OutputStream;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -194,7 +193,10 @@ public class ExcelUtil<T>
// 设置类的私有字段属性可访问. // 设置类的私有字段属性可访问.
field.setAccessible(true); field.setAccessible(true);
Integer column = cellMap.get(attr.name()); Integer column = cellMap.get(attr.name());
fieldsMap.put(column, field); if (column != null)
{
fieldsMap.put(column, field);
}
} }
} }
for (int i = 1; i < rows; i++) for (int i = 1; i < rows; i++)
@ -829,14 +831,7 @@ public class ExcelUtil<T>
} }
else else
{ {
if ((Double) val % 1 > 0) val = new BigDecimal(val.toString()); // 浮点格式处理
{
val = new DecimalFormat("0.00").format(val);
}
else
{
val = new DecimalFormat("0").format(val);
}
} }
} }
else if (cell.getCellTypeEnum() == CellType.STRING) else if (cell.getCellTypeEnum() == CellType.STRING)

4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/utils/DictUtils.java
View File

@ -37,8 +37,8 @@ public class DictUtils
Object cacheObj = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key)); Object cacheObj = SpringUtils.getBean(RedisService.class).getCacheObject(getCacheKey(key));
if (StringUtils.isNotNull(cacheObj)) if (StringUtils.isNotNull(cacheObj))
{ {
List<SysDictData> DictDatas = StringUtils.cast(cacheObj); List<SysDictData> dictDatas = StringUtils.cast(cacheObj);
return DictDatas; return dictDatas;
} }
return null; return null;
} }