From 3b89f724dd45bbeb864ce8a93cd88cdfec32c558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=84=A6=E6=9D=BE?= <xuesong2880115@sina.com>
Date: Thu, 15 Apr 2021 17:26:45 +0800
Subject: [PATCH] Fix bug list classType not same with head type when write

---
 .../write/executor/ExcelWriteAddExecutor.java |  4 +-
 .../easyexcel/test/temp/bug/DataType.java     | 33 ++++++++++++++++
 .../easyexcel/test/temp/bug/ExcelCreat.java   | 38 +++++++++++++++++++
 .../easyexcel/test/temp/bug/HeadType.java     | 28 ++++++++++++++
 4 files changed, 101 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java

diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
index 9f229029..4a148ac1 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
@@ -149,7 +149,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
         Map<String, Field> ignoreMap = writeContext.currentWriteHolder().excelWriteHeadProperty().getIgnoreMap();
         initSortedAllFiledMapFieldList(oneRowData.getClass(), sortedAllFiledMap);
         for (Map.Entry<Integer, Field> entry : sortedAllFiledMap.entrySet()) {
-            cellIndex = entry.getKey();
+            // cellIndex = entry.getKey();
             Field field = entry.getValue();
             String filedName = field.getName();
             boolean uselessData = !beanMap.containsKey(filedName) || beanMapHandledSet.contains(filedName)
@@ -158,7 +158,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
                 continue;
             }
             Object value = beanMap.get(filedName);
-            WriteHandlerUtils.beforeCellCreate(writeContext, row, null, cellIndex, relativeRowIndex, Boolean.FALSE);
+            WriteHandlerUtils.beforeCellCreate(writeContext, row, null, cellIndex++, relativeRowIndex, Boolean.FALSE);
             Cell cell = WorkBookUtil.createCell(row, cellIndex);
             WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE);
             CellData cellData = converterAndSet(currentWriteHolder, value == null ? null : value.getClass(), cell,
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java
new file mode 100644
index 00000000..37b8dc2b
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java
@@ -0,0 +1,33 @@
+package com.alibaba.easyexcel.test.temp.bug;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author jiaosong
+ * @desc
+ * @date 2021/4/6
+ */
+@Data
+public class DataType {
+    /**
+     * 任务id
+     */
+    @ExcelProperty("任务ID")
+    private Integer id;
+
+    @ExcelProperty("多余字段1")
+    private String firstSurplus;
+
+    @ExcelProperty("多余字段2")
+    private String secSurplus;
+
+    @ExcelProperty("多余字段3")
+    private String thirdSurplus;
+
+    @ExcelProperty(value = "备注1")
+    private String firstRemark;
+
+    @ExcelProperty(value = "备注2")
+    private String secRemark;
+}
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java
new file mode 100644
index 00000000..f9d97463
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/ExcelCreat.java
@@ -0,0 +1,38 @@
+package com.alibaba.easyexcel.test.temp.bug;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author jiaosong
+ * @desc
+ * @date 2020/4/6
+ */
+public class ExcelCreat {
+
+
+    public static void main(String[] args) throws FileNotFoundException {
+        List<DataType> data = getData();
+        ExcelWriter excelWriter = null;
+        excelWriter = EasyExcel.write(new FileOutputStream("all.xlsx")).build();
+        WriteSheet writeSheet = EasyExcel.writerSheet(1, "test")
+            .head(HeadType.class)
+            .build();
+        excelWriter.write(data, writeSheet);
+        excelWriter.finish();
+    }
+
+    private static List<DataType> getData() {
+        DataType vo = new DataType();
+        vo.setId(738);
+        vo.setFirstRemark("1222");
+        vo.setSecRemark("22222");
+        return Collections.singletonList(vo);
+    }
+}
diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java
new file mode 100644
index 00000000..15ee006d
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java
@@ -0,0 +1,28 @@
+package com.alibaba.easyexcel.test.temp.bug;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author jiaosong
+ * @desc
+ * @date 2021/4/6
+ */
+@Data
+public class HeadType {
+
+
+    /**
+     * 任务id
+     */
+    @ExcelProperty("任务ID")
+    private Integer id;
+
+
+    @ExcelProperty(value = "备注1")
+    private String firstRemark;
+
+    @ExcelProperty(value = "备注2")
+    private String secRemark;
+
+}