Merge branch 'bugfix' into developing

# Conflicts:
#	src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java

src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java

@@ -24,11 +24,20 @@ import com.alibaba.excel.write.metadata.RowData;
 import com.alibaba.excel.write.metadata.holder.WriteHolder;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
-
 import net.sf.cglib.beans.BeanMap;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
 
 /**
  * Add the data into excel
@@ -61,7 +70,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
     }
 
     private void addOneRowOfDataToExcel(Object oneRowData, int n, int relativeRowIndex,
-        Map<Integer, Field> sortedAllFiledMap) {
+                                        Map<Integer, Field> sortedAllFiledMap) {
         if (oneRowData == null) {
             return;
         }
@@ -110,7 +119,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
     }
 
     private void doAddBasicTypeToExcel(RowData oneRowData, Head head, Row row, int relativeRowIndex, int dataIndex,
-        int cellIndex) {
+                                       int cellIndex) {
         WriteHandlerUtils.beforeCellCreate(writeContext, row, head, cellIndex, relativeRowIndex, Boolean.FALSE);
         Cell cell = WorkBookUtil.createCell(row, cellIndex);
         WriteHandlerUtils.afterCellCreate(writeContext, cell, head, relativeRowIndex, Boolean.FALSE);
@@ -121,7 +130,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
     }
 
     private void addJavaObjectToExcel(Object oneRowData, Row row, int relativeRowIndex,
-        Map<Integer, Field> sortedAllFiledMap) {
+                                      Map<Integer, Field> sortedAllFiledMap) {
         WriteHolder currentWriteHolder = writeContext.currentWriteHolder();
         BeanMap beanMap = BeanMapUtils.create(oneRowData);
         Set<String> beanMapHandledSet = new HashSet<String>();
@@ -149,6 +158,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
                 WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, head, relativeRowIndex, Boolean.FALSE);
                 beanMapHandledSet.add(name);
             }
+            cellIndex++;
         }
         // Finish
         if (beanMapHandledSet.size() == beanMap.size()) {
@@ -157,7 +167,6 @@ 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();
             Field field = entry.getValue();
             String filedName = field.getName();
             boolean uselessData = !beanMap.containsKey(filedName) || beanMapHandledSet.contains(filedName)
@@ -167,7 +176,7 @@ public class ExcelWriteAddExecutor extends AbstractExcelWriteExecutor {
             }
             Object value = beanMap.get(filedName);
             WriteHandlerUtils.beforeCellCreate(writeContext, row, null, cellIndex, relativeRowIndex, Boolean.FALSE);
-            Cell cell = WorkBookUtil.createCell(row, cellIndex);
+            Cell cell = WorkBookUtil.createCell(row, cellIndex++);
             WriteHandlerUtils.afterCellCreate(writeContext, cell, null, relativeRowIndex, Boolean.FALSE);
             WriteCellData<?> cellData = converterAndSet(currentWriteHolder,
                 FieldUtils.getFieldClass(beanMap, filedName), null, cell, value, null, null, relativeRowIndex);

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;
+}

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

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;
+
+}