优化代码

RuoYi

2022-09-09 e3b12f5621abf80b7c52355c0f6c27dcec7a083d

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

@@ -808,7 +808,6 @@
            if (!headerStyles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

                style = wb.createCellStyle();

                style.cloneStyleFrom(styles.get("data"));

                style.setAlignment(HorizontalAlignment.CENTER);

                style.setVerticalAlignment(VerticalAlignment.CENTER);

@@ -842,7 +841,6 @@
            if (!styles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

                style = wb.createCellStyle();

                style.setAlignment(excel.align());

                style.setVerticalAlignment(VerticalAlignment.CENTER);

                style.setBorderRight(BorderStyle.THIN);

@@ -993,7 +991,7 @@
            {

                // 创建cell

                cell = row.createCell(column);

                if (isSubListValue(vo) && attr.needMerge())

                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())

                {

                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);

                    sheet.addMergedRegion(cellAddress);

@@ -1020,7 +1018,7 @@
                }

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

                {

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

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

                }

                else if (!attr.handler().equals(ExcelHandlerAdapter.class))

                {