Excel注解支持设置BigDecimal精度&舍入规则

RuoYi

2020-08-19 da146c2a708387059d4e31cbe1db0fdd8ceb41e3

 ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

@@ -8,6 +8,7 @@
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;

@@ -17,7 +18,6 @@
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,7 +41,6 @@
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;

@@ -478,7 +477,7 @@
    {

        if (ColumnType.STRING == attr.cellType())

        {

            cell.setCellType(CellType.NUMERIC);

            cell.setCellType(CellType.STRING);

            cell.setCellValue(StringUtils.isNull(value) ? attr.defaultValue() : value + attr.suffix());

        }

        else if (ColumnType.NUMERIC == attr.cellType())

@@ -548,9 +547,13 @@
                {

                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));

                }

                else if (StringUtils.isNotEmpty(dictType))

                else if (StringUtils.isNotEmpty(dictType) && StringUtils.isNotNull(value))

                {

                    cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));

                }

                else if (value instanceof BigDecimal && -1 != attr.scale())

                {

                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());

                }

                else

                {

@@ -898,7 +901,14 @@
                    }

                    else

                    {

                        val = new BigDecimal(val.toString()); // 浮点格式处理

                        if ((Double) val % 1 > 0)

                        {

                            val = new BigDecimal(val.toString());

                        }

                        else

                        {

                            val = new DecimalFormat("0").format(val);

                        }

                    }

                }

                else if (cell.getCellTypeEnum() == CellType.STRING)