支持自定义显示Excel属性列

RuoYi

2024-11-07 f381ce3fe1dc281b49bbaaa4d4a5d496630eae5d

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

@@ -7,12 +7,14 @@
import java.io.OutputStream;

import java.lang.reflect.Field;

import java.lang.reflect.Method;

import java.lang.reflect.ParameterizedType;

import java.math.BigDecimal;

import java.text.DecimalFormat;

import java.time.LocalDate;

import java.time.LocalDateTime;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Comparator;

import java.util.Date;

import java.util.HashMap;

@@ -22,7 +24,9 @@
import java.util.UUID;

import java.util.stream.Collectors;

import javax.servlet.http.HttpServletResponse;

import org.apache.commons.lang3.ArrayUtils;

import org.apache.commons.lang3.RegExUtils;

import org.apache.commons.lang3.reflect.FieldUtils;

import org.apache.poi.hssf.usermodel.HSSFClientAnchor;

import org.apache.poi.hssf.usermodel.HSSFPicture;

import org.apache.poi.hssf.usermodel.HSSFPictureData;

@@ -35,6 +39,7 @@
import org.apache.poi.ss.usermodel.CellStyle;

import org.apache.poi.ss.usermodel.CellType;

import org.apache.poi.ss.usermodel.ClientAnchor;

import org.apache.poi.ss.usermodel.DataFormat;

import org.apache.poi.ss.usermodel.DataValidation;

import org.apache.poi.ss.usermodel.DataValidationConstraint;

import org.apache.poi.ss.usermodel.DataValidationHelper;

@@ -44,6 +49,7 @@
import org.apache.poi.ss.usermodel.Font;

import org.apache.poi.ss.usermodel.HorizontalAlignment;

import org.apache.poi.ss.usermodel.IndexedColors;

import org.apache.poi.ss.usermodel.Name;

import org.apache.poi.ss.usermodel.PictureData;

import org.apache.poi.ss.usermodel.Row;

import org.apache.poi.ss.usermodel.Sheet;

@@ -92,6 +98,11 @@
    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";



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



    /**

     * 用于dictType属性数据存储，避免重复查缓存

     */

    public Map<String, String> sysDictMap = new HashMap<String, String>();



    /**

     * Excel sheet最大行数，默认65536

@@ -149,6 +160,26 @@
    private short maxHeight;



    /**

     * 合并后最后行数

     */

    private int subMergedLastRowNum = 0;



    /**

     * 合并后开始行数

     */

    private int subMergedFirstRowNum = 1;



    /**

     * 对象的子列表方法

     */

    private Method subMethod;



    /**

     * 对象的子列表属性

     */

    private List<Field> subFields;



    /**

     * 统计列表

     */

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

@@ -163,9 +194,39 @@
     */

    public Class<T> clazz;



    /**

     * 需要显示列属性

     */

    public String[] includeFields;



    /**

     * 需要排除列属性

     */

    public String[] excludeFields;



    public ExcelUtil(Class<T> clazz)

    {

        this.clazz = clazz;

    }



    /**

     * 仅在Excel中显示列属性

     *

     * @param fields 列属性名 示例[单个"name"/多个"id","name"]

     */

    public void showColumn(String... fields)

    {

        this.includeFields = fields;

    }



    /**

     * 隐藏Excel中列属性

     *

     * @param fields 列属性名 示例[单个"name"/多个"id","name"]

     */

    public void hideColumn(String... fields)

    {

        this.excludeFields = fields;

    }



    public void init(List<T> list, String sheetName, String title, Type type)

@@ -181,6 +242,7 @@
        createExcelField();

        createWorkbook();

        createTitle();

        createSubHead();

    }



    /**

@@ -190,13 +252,48 @@
    {

        if (StringUtils.isNotEmpty(title))

        {

            subMergedFirstRowNum++;

            subMergedLastRowNum++;

            int titleLastCol = this.fields.size() - 1;

            if (isSubList())

            {

                titleLastCol = titleLastCol + subFields.size() - 1;

            }

            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);

            titleRow.setHeightInPoints(30);

            Cell titleCell = titleRow.createCell(0);

            titleCell.setCellStyle(styles.get("title"));

            titleCell.setCellValue(title);

            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(),

                    this.fields.size() - 1));

            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));

        }

    }



    /**

     * 创建对象的子列表名称

     */

    public void createSubHead()

    {

        if (isSubList())

        {

            subMergedFirstRowNum++;

            subMergedLastRowNum++;

            Row subRow = sheet.createRow(rownum);

            int excelNum = 0;

            for (Object[] objects : fields)

            {

                Excel attr = (Excel) objects[1];

                Cell headCell1 = subRow.createCell(excelNum);

                headCell1.setCellValue(attr.name());

                headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));

                excelNum++;

            }

            int headFirstRow = excelNum - 1;

            int headLastRow = headFirstRow + subFields.size() - 1;

            if (headLastRow > headFirstRow)

            {

                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));

            }

            rownum++;

        }

    }



@@ -206,9 +303,23 @@
     * @param is 输入流

     * @return 转换后集合

     */

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

    public List<T> importExcel(InputStream is)

    {

        return importExcel(is, 0);

        List<T> list = null;

        try

        {

            list = importExcel(is, 0);

        }

        catch (Exception e)

        {

            log.error("导入Excel异常{}", e.getMessage());

            throw new UtilException(e.getMessage());

        }

        finally

        {

            IOUtils.closeQuietly(is);

        }

        return list;

    }



    /**

@@ -254,7 +365,6 @@
        }

        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1

        int rows = sheet.getLastRowNum();



        if (rows > 0)

        {

            // 定义一个map用于存放excel列的序号和field.

@@ -369,17 +479,22 @@
                        {

                            propertyName = field.getName() + "." + attr.targetAttr();

                        }

                        else if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        if (StringUtils.isNotEmpty(attr.readConverterExp()))

                        {

                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());

                        }

                        else if (StringUtils.isNotEmpty(attr.dictType()))

                        {

                            val = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());

                            if (!sysDictMap.containsKey(attr.dictType() + val))

                            {

                                String dictValue = reverseDictByExp(Convert.toStr(val), attr.dictType(), attr.separator());

                                sysDictMap.put(attr.dictType() + val, dictValue);

                            }

                            val = sysDictMap.get(attr.dictType() + val);

                        }

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

                        {

                            val = dataFormatHandlerAdapter(val, attr);

                            val = dataFormatHandlerAdapter(val, attr, null);

                        }

                        else if (ColumnType.IMAGE == attr.cellType() && StringUtils.isNotEmpty(pictures))

                        {

@@ -576,8 +691,20 @@
            // 写入各个字段的列头名称

            for (Object[] os : fields)

            {

                Field field = (Field) os[0];

                Excel excel = (Excel) os[1];

                this.createCell(excel, row, column++);

                if (Collection.class.isAssignableFrom(field.getType()))

                {

                    for (Field subField : subFields)

                    {

                        Excel subExcel = subField.getAnnotation(Excel.class);

                        this.createHeadCell(subExcel, row, column++);

                    }

                }

                else

                {

                    this.createHeadCell(excel, row, column++);

                }

            }

            if (Type.EXPORT.equals(type))

            {

@@ -593,21 +720,67 @@
     * @param index 序号

     * @param row 单元格行

     */

    @SuppressWarnings("unchecked")

    public void fillExcelData(int index, Row row)

    {

        int startNo = index * sheetSize;

        int endNo = Math.min(startNo + sheetSize, list.size());

        int rowNo = (1 + rownum) - startNo;

        for (int i = startNo; i < endNo; i++)

        {

            row = sheet.createRow(i + 1 + rownum - startNo);

            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;

            row = sheet.createRow(rowNo);

            // 得到导出对象.

            T vo = (T) list.get(i);

            Collection<?> subList = null;

            if (isSubList())

            {

                if (isSubListValue(vo))

                {

                    subList = getListCellValue(vo);

                    subMergedLastRowNum = subMergedLastRowNum + subList.size();

                }

                else

                {

                    subMergedFirstRowNum++;

                    subMergedLastRowNum++;

                }

            }

            int column = 0;

            for (Object[] os : fields)

            {

                Field field = (Field) os[0];

                Excel excel = (Excel) os[1];

                this.addCell(excel, row, vo, field, column++);

                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))

                {

                    boolean subFirst = false;

                    for (Object obj : subList)

                    {

                        if (subFirst)

                        {

                            rowNo++;

                            row = sheet.createRow(rowNo);

                        }

                        List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);

                        int subIndex = 0;

                        for (Field subField : subFields)

                        {

                            if (subField.isAnnotationPresent(Excel.class))

                            {

                                subField.setAccessible(true);

                                Excel attr = subField.getAnnotation(Excel.class);

                                this.addCell(attr, row, (T) obj, subField, column + subIndex);

                            }

                            subIndex++;

                        }

                        subFirst = true;

                    }

                    this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();

                }

                else

                {

                    this.addCell(excel, row, vo, field, column++);

                }

            }

        }

    }

@@ -630,6 +803,8 @@
        titleFont.setFontHeightInPoints((short) 16);

        titleFont.setBold(true);

        style.setFont(titleFont);

        DataFormat dataFormat = wb.createDataFormat();

        style.setDataFormat(dataFormat.getFormat("@"));

        styles.put("title", style);



        style = wb.createCellStyle();

@@ -650,20 +825,6 @@
        styles.put("data", style);



        style = wb.createCellStyle();

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

        style.setAlignment(HorizontalAlignment.CENTER);

        style.setVerticalAlignment(VerticalAlignment.CENTER);

        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());

        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

        Font headerFont = wb.createFont();

        headerFont.setFontName("Arial");

        headerFont.setFontHeightInPoints((short) 10);

        headerFont.setBold(true);

        headerFont.setColor(IndexedColors.WHITE.getIndex());

        style.setFont(headerFont);

        styles.put("header", style);



        style = wb.createCellStyle();

        style.setAlignment(HorizontalAlignment.CENTER);

        style.setVerticalAlignment(VerticalAlignment.CENTER);

        Font totalFont = wb.createFont();

@@ -672,35 +833,140 @@
        style.setFont(totalFont);

        styles.put("total", style);



        style = wb.createCellStyle();

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

        style.setAlignment(HorizontalAlignment.LEFT);

        styles.put("data1", style);

        styles.putAll(annotationHeaderStyles(wb, styles));



        style = wb.createCellStyle();

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

        style.setAlignment(HorizontalAlignment.CENTER);

        styles.put("data2", style);



        style = wb.createCellStyle();

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

        style.setAlignment(HorizontalAlignment.RIGHT);

        styles.put("data3", style);

        styles.putAll(annotationDataStyles(wb));



        return styles;

    }



    /**

     * 根据Excel注解创建表格头样式

     * 
     * @param wb 工作薄对象

     * @return 自定义样式列表

     */

    private Map<String, CellStyle> annotationHeaderStyles(Workbook wb, Map<String, CellStyle> styles)

    {

        Map<String, CellStyle> headerStyles = new HashMap<String, CellStyle>();

        for (Object[] os : fields)

        {

            Excel excel = (Excel) os[1];

            String key = StringUtils.format("header_{}_{}", excel.headerColor(), excel.headerBackgroundColor());

            if (!headerStyles.containsKey(key))

            {

                CellStyle style = wb.createCellStyle();

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

                style.setAlignment(HorizontalAlignment.CENTER);

                style.setVerticalAlignment(VerticalAlignment.CENTER);

                style.setFillForegroundColor(excel.headerBackgroundColor().index);

                style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

                Font headerFont = wb.createFont();

                headerFont.setFontName("Arial");

                headerFont.setFontHeightInPoints((short) 10);

                headerFont.setBold(true);

                headerFont.setColor(excel.headerColor().index);

                style.setFont(headerFont);

                // 设置表格头单元格文本形式

                DataFormat dataFormat = wb.createDataFormat();

                style.setDataFormat(dataFormat.getFormat("@"));

                headerStyles.put(key, style);

            }

        }

        return headerStyles;

    }



    /**

     * 根据Excel注解创建表格列样式

     * 
     * @param wb 工作薄对象

     * @return 自定义样式列表

     */

    private Map<String, CellStyle> annotationDataStyles(Workbook wb)

    {

        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();

        for (Object[] os : fields)

        {

            Field field = (Field) os[0];

            Excel excel = (Excel) os[1];

            if (Collection.class.isAssignableFrom(field.getType()))

            {

                ParameterizedType pt = (ParameterizedType) field.getGenericType();

                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];

                List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);

                for (Field subField : subFields)

                {

                    Excel subExcel = subField.getAnnotation(Excel.class);

                    annotationDataStyles(styles, subField, subExcel);

                }

            }

            else

            {

                annotationDataStyles(styles, field, excel);

            }

        }

        return styles;

    }



    /**

     * 根据Excel注解创建表格列样式

     * 
     * @param styles 自定义样式列表

     * @param field  属性列信息

     * @param excel  注解信息

     */

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

    {

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

        if (!styles.containsKey(key))

        {

            CellStyle style = wb.createCellStyle();

            style.setAlignment(excel.align());

            style.setVerticalAlignment(VerticalAlignment.CENTER);

            style.setBorderRight(BorderStyle.THIN);

            style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderLeft(BorderStyle.THIN);

            style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderTop(BorderStyle.THIN);

            style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setBorderBottom(BorderStyle.THIN);

            style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());

            style.setFillPattern(FillPatternType.SOLID_FOREGROUND);

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

            Font dataFont = wb.createFont();

            dataFont.setFontName("Arial");

            dataFont.setFontHeightInPoints((short) 10);

            dataFont.setColor(excel.color().index);

            style.setFont(dataFont);

            if (ColumnType.TEXT == excel.cellType())

            {

                DataFormat dataFormat = wb.createDataFormat();

                style.setDataFormat(dataFormat.getFormat("@"));

            }

            styles.put(key, style);

        }

    }



    /**

     * 创建单元格

     */

    public Cell createCell(Excel attr, Row row, int column)

    public Cell createHeadCell(Excel attr, Row row, int column)

    {

        // 创建列

        Cell cell = row.createCell(column);

        // 写入列信息

        cell.setCellValue(attr.name());

        setDataValidation(attr, row, column);

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

        cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));

        if (isSubList())

        {

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

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

            if (attr.needMerge())

            {

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

            }

        }

        return cell;

    }



@@ -713,13 +979,17 @@
     */

    public void setCellVo(Object value, Excel attr, Cell cell)

    {

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

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

        {

            String cellValue = Convert.toStr(value);

            // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。

            if (StringUtils.startsWithAny(cellValue, FORMULA_STR))

            {

                cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");

            }

            if (value instanceof Collection && StringUtils.equals("[]", cellValue))

            {

                cellValue = StringUtils.EMPTY;

            }

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

        }

@@ -786,10 +1056,29 @@
            // 设置列宽

            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));

        }

        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0)

        if (StringUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0 || attr.comboReadDict())

        {

            // 提示信息或只能选择不能输入的列内容.

            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);

            String[] comboArray = attr.combo();

            if (attr.comboReadDict())

            {

                if (!sysDictMap.containsKey("combo_" + attr.dictType()))

                {

                    String labels = DictUtils.getDictLabels(attr.dictType());

                    sysDictMap.put("combo_" + attr.dictType(), labels);

                }

                String val = sysDictMap.get("combo_" + attr.dictType());

                comboArray = StringUtils.split(val, DictUtils.SEPARATOR);

            }

            if (comboArray.length > 15 || StringUtils.join(comboArray).length() > 255)

            {

                // 如果下拉数大于15或字符串长度大于255，则使用一个新sheet存储，避免生成的模板下拉值获取不到

                setXSSFValidationWithHidden(sheet, comboArray, attr.prompt(), 1, 100, column, column);

            }

            else

            {

                // 提示信息或只能选择不能输入的列内容.

                setPromptOrValidation(sheet, comboArray, attr.prompt(), 1, 100, column, column);

            }

        }

    }



@@ -808,8 +1097,12 @@
            {

                // 创建cell

                cell = row.createCell(column);

                int align = attr.align().value();

                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));

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

                {

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

                    sheet.addMergedRegion(cellAddress);

                }

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



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

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

@@ -827,15 +1120,20 @@
                }

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

                {

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

                    if (!sysDictMap.containsKey(dictType + value))

                    {

                        String lable = convertDictByExp(Convert.toStr(value), dictType, separator);

                        sysDictMap.put(dictType + value, lable);

                    }

                    cell.setCellValue(sysDictMap.get(dictType + value));

                }

                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))

                {

                    cell.setCellValue(dataFormatHandlerAdapter(value, attr));

                    cell.setCellValue(dataFormatHandlerAdapter(value, attr, cell));

                }

                else

                {

@@ -890,6 +1188,58 @@
    }



    /**

     * 设置某些列的值只能输入预制的数据,显示下拉框（兼容超出一定数量的下拉框）.

     * 
     * @param sheet 要设置的sheet.

     * @param textlist 下拉框显示的内容

     * @param promptContent 提示内容

     * @param firstRow 开始行

     * @param endRow 结束行

     * @param firstCol 开始列

     * @param endCol 结束列

     */

    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++)

        {

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

        }

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

        Name name = wb.createName();

        name.setNameName(hideSheetName + "_data");

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

        DataValidationHelper helper = sheet.getDataValidationHelper();

        // 加载下拉列表内容

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

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

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

        // 数据有效性对象

        DataValidation dataValidation = helper.createValidation(constraint, regions);

        if (StringUtils.isNotEmpty(promptContent))

        {

            // 如果设置了提示信息则鼠标放上去提示

            dataValidation.createPromptBox("", promptContent);

            dataValidation.setShowPromptBox(true);

        }

        // 处理Excel兼容性问题

        if (dataValidation instanceof XSSFDataValidation)

        {

            dataValidation.setSuppressDropDownArrow(true);

            dataValidation.setShowErrorBox(true);

        }

        else

        {

            dataValidation.setSuppressDropDownArrow(false);

        }



        sheet.addValidationData(dataValidation);

        // 设置hiddenSheet隐藏

        wb.setSheetHidden(wb.getSheetIndex(hideSheet), true);

    }



    /**

     * 解析导出值 0=男,1=女,2=未知

     * 

     * @param propertyValue 参数值

@@ -904,7 +1254,7 @@
        for (String item : convertSource)

        {

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

            if (StringUtils.containsAny(separator, propertyValue))

            if (StringUtils.containsAny(propertyValue, separator))

            {

                for (String value : propertyValue.split(separator))

                {

@@ -941,7 +1291,7 @@
        for (String item : convertSource)

        {

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

            if (StringUtils.containsAny(separator, propertyValue))

            if (StringUtils.containsAny(propertyValue, separator))

            {

                for (String value : propertyValue.split(separator))

                {

@@ -996,13 +1346,13 @@
     * @param excel 数据注解

     * @return

     */

    public String dataFormatHandlerAdapter(Object value, Excel excel)

    public String dataFormatHandlerAdapter(Object value, Excel excel, Cell cell)

    {

        try

        {

            Object instance = excel.handler().newInstance();

            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });

            value = formatMethod.invoke(instance, value, excel.args());

            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });

            value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);

        }

        catch (Exception e)

        {

@@ -1062,7 +1412,7 @@
     */

    public String encodingFilename(String filename)

    {

        filename = UUID.randomUUID().toString() + "_" + filename + ".xlsx";

        filename = UUID.randomUUID() + "_" + filename + ".xlsx";

        return filename;

    }



@@ -1152,27 +1502,79 @@
        List<Field> tempFields = new ArrayList<>();

        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));

        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));

        for (Field field : tempFields)

        if (StringUtils.isNotEmpty(includeFields))

        {

            // 单注解

            if (field.isAnnotationPresent(Excel.class))

            for (Field field : tempFields)

            {

                Excel attr = field.getAnnotation(Excel.class);

                if (attr != null && (attr.type() == Type.ALL || attr.type() == type))

                if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))

                {

                    field.setAccessible(true);

                    fields.add(new Object[] { field, attr });

                    addField(fields, field);

                }

            }



            // 多注解

            if (field.isAnnotationPresent(Excels.class))

        }

        else if (StringUtils.isNotEmpty(excludeFields))

        {

            for (Field field : tempFields)

            {

                Excels attrs = field.getAnnotation(Excels.class);

                Excel[] excels = attrs.value();

                for (Excel attr : excels)

                if (!ArrayUtils.contains(this.excludeFields, field.getName()))

                {

                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type))

                    addField(fields, field);

                }

            }

        }

        else

        {

            for (Field field : tempFields)

            {

                addField(fields, field);

            }

        }

        return fields;

    }



    /**

     * 添加字段信息

     */

    public void addField(List<Object[]> fields, Field field)

    {

        // 单注解

        if (field.isAnnotationPresent(Excel.class))

        {

            Excel attr = field.getAnnotation(Excel.class);

            if (attr != null && (attr.type() == Type.ALL || attr.type() == type))

            {

                field.setAccessible(true);

                fields.add(new Object[] { field, attr });

            }

            if (Collection.class.isAssignableFrom(field.getType()))

            {

                subMethod = getSubMethod(field.getName(), clazz);

                ParameterizedType pt = (ParameterizedType) field.getGenericType();

                Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];

                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);

            }

        }



        // 多注解

        if (field.isAnnotationPresent(Excels.class))

        {

            Excels attrs = field.getAnnotation(Excels.class);

            Excel[] excels = attrs.value();

            for (Excel attr : excels)

            {

                if (StringUtils.isNotEmpty(includeFields))

                {

                    if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())

                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))

                    {

                        field.setAccessible(true);

                        fields.add(new Object[] { field, attr });

                    }

                }

                else

                {

                    if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())

                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))

                    {

                        field.setAccessible(true);

                        fields.add(new Object[] { field, attr });

@@ -1180,7 +1582,6 @@
                }

            }

        }

        return fields;

    }



    /**

@@ -1329,7 +1730,7 @@
                    HSSFPicture pic = (HSSFPicture) shape;

                    int pictureIndex = pic.getPictureIndex() - 1;

                    HSSFPictureData picData = pictures.get(pictureIndex);

                    String picIndex = String.valueOf(anchor.getRow1()) + "_" + String.valueOf(anchor.getCol1());

                    String picIndex = anchor.getRow1() + "_" + anchor.getCol1();

                    sheetIndexPicMap.put(picIndex, picData);

                }

            }

@@ -1405,4 +1806,61 @@
        }

        return str;

    }



    /**

     * 是否有对象的子列表

     */

    public boolean isSubList()

    {

        return StringUtils.isNotNull(subFields) && subFields.size() > 0;

    }



    /**

     * 是否有对象的子列表，集合不为空

     */

    public boolean isSubListValue(T vo)

    {

        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;

    }



    /**

     * 获取集合的值

     */

    public Collection<?> getListCellValue(Object obj)

    {

        Object value;

        try

        {

            value = subMethod.invoke(obj, new Object[] {});

        }

        catch (Exception e)

        {

            return new ArrayList<Object>();

        }

        return (Collection<?>) value;

    }



    /**

     * 获取对象的子列表方法

     * 
     * @param name 名称

     * @param pojoClass 类对象

     * @return 子列表方法

     */

    public Method getSubMethod(String name, Class<?> pojoClass)

    {

        StringBuffer getMethodName = new StringBuffer("get");

        getMethodName.append(name.substring(0, 1).toUpperCase());

        getMethodName.append(name.substring(1));

        Method method = null;

        try

        {

            method = pojoClass.getMethod(getMethodName.toString(), new Class[] {});

        }

        catch (Exception e)

        {

            log.error("获取对象异常{}", e.getMessage());

        }

        return method;

    }

}