修复combo属性过多sheet出现的异常问题

RuoYi

2025-11-13 6aecd35a4ff01c2811e3bc9aaf55a8f566e2ca10

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

@@ -73,6 +73,8 @@
{

    private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);



    public static final String SEPARATOR = ",";



    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";



    public static final String[] FORMULA_STR = { "=", "-", "+", "@" };

@@ -156,11 +158,6 @@
     * 统计列表

     */

    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();



    /**

     * 数字格式

     */

    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");



    /**

     * 实体对象

@@ -284,10 +281,22 @@
     */

    public List<T> importExcel(InputStream is)

    {

        return importExcel(is, 0);

    }



    /**

     * 对excel表单默认第一个索引名转换成list

     * 
     * @param is 输入流

     * @param titleNum 标题占用行数

     * @return 转换后集合

     */

    public List<T> importExcel(InputStream is, int titleNum)

    {

        List<T> list = null;

        try

        {

            list = importExcel(is, 0);

            list = importExcel(StringUtils.EMPTY, is, titleNum);

        }

        catch (Exception e)

        {

@@ -299,18 +308,6 @@
            IOUtils.closeQuietly(is);

        }

        return list;

    }



    /**

     * 对excel表单默认第一个索引名转换成list

     * 
     * @param is 输入流

     * @param titleNum 标题占用行数

     * @return 转换后集合

     */

    public List<T> importExcel(InputStream is, int titleNum) throws Exception

    {

        return importExcel(StringUtils.EMPTY, is, titleNum);

    }



    /**

@@ -390,7 +387,7 @@
                    if (String.class == fieldType)

                    {

                        String s = Convert.toStr(val);

                        if (StringUtils.endsWith(s, ".0"))

                        if (s.matches("^\\d+\\.0$"))

                        {

                            val = StringUtils.substringBefore(s, ".0");

                        }

@@ -724,6 +721,7 @@
        style = wb.createCellStyle();

        style.setAlignment(HorizontalAlignment.CENTER);

        style.setVerticalAlignment(VerticalAlignment.CENTER);

        style.setDataFormat(dataFormat.getFormat("######0.00"));

        Font totalFont = wb.createFont();

        totalFont.setFontName("Arial");

        totalFont.setFontHeightInPoints((short) 10);

@@ -814,7 +812,7 @@
     */

    public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel)

    {

        String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());

        String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText());

        if (!styles.containsKey(key))

        {

            CellStyle style = wb.createCellStyle();

@@ -830,6 +828,7 @@
            style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

            style.setFillForegroundColor(excel.backgroundColor().getIndex());

            style.setWrapText(excel.wrapText());

            Font dataFont = wb.createFont();

            dataFont.setFontName("Arial");

            dataFont.setFontHeightInPoints((short) 10);

@@ -858,7 +857,7 @@
        if (isSubList())

        {

            // 填充默认样式，防止合并单元格样式失效

            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));

            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));

            if (attr.needMerge())

            {

                sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));

@@ -990,7 +989,7 @@
                        sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column));

                    }

                }

                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));

                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));



                // 用于读取对象中的属性

                Object value = getTargetValue(vo, field, attr);

@@ -999,6 +998,7 @@
                String separator = attr.separator();

                if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))

                {

                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));

                    cell.setCellValue(parseDateToStr(dateFormat, value));

                }

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

@@ -1079,18 +1079,36 @@
    public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)

    {

        String hideSheetName = "combo_" + firstCol + "_" + endCol;

        Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据

        for (int i = 0; i < textlist.length; i++)

        Sheet hideSheet = null;

        String hideSheetDataName = hideSheetName + "_data";

        Name name = wb.getName(hideSheetDataName);

        if (name != null)

        {

            hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);

            // 名称已存在，尝试从名称的引用中找到sheet名称

            String refersToFormula = name.getRefersToFormula();

            if (StringUtils.isNotEmpty(refersToFormula) && refersToFormula.contains("!"))

            {

                String sheetNameFromFormula = refersToFormula.substring(0, refersToFormula.indexOf("!"));

                hideSheet = wb.getSheet(sheetNameFromFormula);

            }

        }

        // 创建名称，可被其他单元格引用

        Name name = wb.createName();

        name.setNameName(hideSheetName + "_data");

        name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);



        if (hideSheet == null)

        {

            hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据

            for (int i = 0; i < textlist.length; i++)

            {

                hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);

            }

            // 创建名称，可被其他单元格引用

            name = wb.createName();

            name.setNameName(hideSheetDataName);

            name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);

        }



        DataValidationHelper helper = sheet.getDataValidationHelper();

        // 加载下拉列表内容

        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");

        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetDataName);

        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列

        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);

        // 数据有效性对象

@@ -1128,7 +1146,7 @@
    public static String convertByExp(String propertyValue, String converterExp, String separator)

    {

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        String[] convertSource = converterExp.split(SEPARATOR);

        for (String item : convertSource)

        {

            String[] itemArray = item.split("=");

@@ -1165,7 +1183,7 @@
    public static String reverseByExp(String propertyValue, String converterExp, String separator)

    {

        StringBuilder propertyString = new StringBuilder();

        String[] convertSource = converterExp.split(",");

        String[] convertSource = converterExp.split(SEPARATOR);

        for (String item : convertSource)

        {

            String[] itemArray = item.split("=");

@@ -1253,7 +1271,7 @@
            {

                cell = row.createCell(key);

                cell.setCellStyle(styles.get("total"));

                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));

                cell.setCellValue(statistics.get(key));

            }

            statistics.clear();

        }

@@ -1447,7 +1465,8 @@
        {

            this.sheet = wb.createSheet();

            this.createTitle();

            wb.setSheetName(index, sheetName + index);

            int actualIndex = wb.getSheetIndex(this.sheet);

            wb.setSheetName(actualIndex, sheetName + index);

        }

    }