导出数据

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

@@ -296,14 +296,15 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
         }
 
         // 写入本行内容
-        for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
-            ExportColumn column = this.config.getColumns().get(columnPos);
+        int columnPos = 0;
+        for (ExportColumn column : this.config.getColumns()) {
             String columnName = column.getName();
             String value = StringHelper.getFirst(rowHandle.get(t, columnName));
 
             // 当不需要合并历史记录时，则创建新的内容
             Cell cell = createCell(row, columnPos, value, true);
             mergerColumn(column, columnPos, false);
+            columnPos++;
         }
 
         rowIndex++;
@@ -357,8 +358,8 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             return this;
         }
         // 合并数据配置
-        for (int columnPos = 0; columnPos < this.config.getColumns().size(); columnPos++) {
-            ExportColumn column = this.config.getColumns().get(columnPos);
+        int columnPos = 0;
+        for (ExportColumn column : this.config.getColumns()) {
             mergerColumn(column, columnPos, true);
 
             if (column.getWidth() < 1) {
@@ -368,6 +369,7 @@ public class ExcelConsole<T extends Object> implements DbRow<T> {
             } else {
                 sheet.setColumnWidth(columnPos, getUnit(column.getWidth()));
             }
+            columnPos++;
         }
 
         try {