RuoYi
2021-06-02 b7f3c68eca343de30ca36a68cd796188b5086f72
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -229,6 +229,10 @@
            {
                // 从第2行开始取数据,默认第一行是表头.
                Row row = sheet.getRow(i);
                if(row == null)
                {
                    continue;
                }
                T entity = null;
                for (Map.Entry<Integer, Field> entry : fieldsMap.entrySet())
                {
@@ -537,7 +541,10 @@
        }
        else if (ColumnType.NUMERIC == attr.cellType())
        {
            cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
            if (StringUtils.isNotNull(value))
            {
                cell.setCellValue(StringUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value));
            }
        }
        else if (ColumnType.IMAGE == attr.cellType())
        {
@@ -1059,7 +1066,7 @@
                    }
                    else
                    {
                        if ((Double) val % 1 > 0)
                        if ((Double) val % 1 != 0)
                        {
                            val = new BigDecimal(val.toString());
                        }