EXCEL自定义列处理

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExcelConsole.java

@@ -187,7 +187,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         String[] columns = new String[this.config.getColumns().size()];
         int pos = 0;
         for (ExportColumn column : this.config.getColumns()) {
-            column.column = pos;
+            column.columnIndex = pos;
             columns[pos++] = column.getTitle();
         }
         return TableHeadHelper.getTableHead(columns);
@@ -282,7 +282,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         // 设置列宽度
         // 合并数据配置
         for (ExportColumn column : this.config.getColumns()) {
-            sheet.setColumnWidth(column.column, getUnit(column.getWidth()));
+            sheet.setColumnWidth(column.columnIndex, getUnit(column.getWidth()));
             // 列样式
             column.cellStyle = createColumnStyle(this.workbook, column);
         }
@@ -318,10 +318,10 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         // 设置列别名
         for (ExportColumn column : this.config.getColumns()) {
             map.put(column.getName(), String.format("%s:%s",
-                    CellReferenceUtil.getCoordName(column.column, this.startDataRowIndex),
-                    CellReferenceUtil.getCoordName(column.column, this.endDataRowIndex)
+                    CellReferenceUtil.getCoordName(column.columnIndex, this.startDataRowIndex),
+                    CellReferenceUtil.getCoordName(column.columnIndex, this.endDataRowIndex)
             ));
-            map.put(column.getName() + "_COL", CellReferenceUtil.getColName(column.column));
+            map.put(column.getName() + "_COL", CellReferenceUtil.getColName(column.columnIndex));
         }
         // 数据行开始行号
         map.put("startDataRowIndex", CellReferenceUtil.getRowName(this.startDataRowIndex));
@@ -400,9 +400,9 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             // 当前行行高
             height = Math.max(nowCellHeight, height);
             // 当不需要合并历史记录时，则创建新的内容
-            createCell(row, column.column, value, column.cellStyle);
+            createCell(row, column.columnIndex, value, column.cellStyle);
             // 合并列
-            mergerColumn(column, column.column, false);
+            mergerColumn(column, column.columnIndex, false);
         }
 
         row.setHeight((short) Math.min(height, Short.MAX_VALUE));
@@ -484,7 +484,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         // 合并数据配置
         if (this.rowData > 0) {
             for (ExportColumn column : this.config.getColumns()) {
-                mergerColumn(column, column.column, true);
+                mergerColumn(column, column.columnIndex, true);
             }
         }
 

yzg-util-db/src/main/java/com/yanzuoguang/excel/ExportColumn.java

@@ -47,7 +47,7 @@ public class ExportColumn {
     /**
      * 列序号
      */
-    int column;
+    int columnIndex;
     /**
      * 合计列数据
      */