!48 ExcelUtil 功能优化 Merge pull request !48 from soulCoke/master

若依

2020-07-23 55095a50b5df8b6207bc92fbcbc065c2bcd4ba7d

!48 ExcelUtil 功能优化
Merge pull request !48 from soulCoke/master

 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 ) { // 字段在excel 中没有，那么就不需要设置值

                        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)