Merge branch 'master' into master

Author: hellokaton

README.md

@@ -21,13 +21,13 @@ Easier to read and generate an excel file, supports 2003 and 2007.
 
 # Usage
 
-Add maven dependency
+As maven dependency
 
 ```xml
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
 </dependency>
 ```
 

docs/README.md

@@ -43,7 +43,7 @@
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
 </dependency>
 ```
 
@@ -236,6 +236,10 @@ excelPlus.export(Exporter.create(cardSecrets).byTemplate("tpl.xls")).writeAsFile
 
 # 版本更新
 
+<b>v0.0.3</b>
+
+1. 修复自定义 `SheetName` 读取失败
+
 <b>v0.0.2</b>
 
 1. 添加验证行记录各项指标

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>0.0.2</version>
+    <version>0.0.3</version>
     <name>excel-plus</name>
     <url>https://biezhi.github.io/excel-plus</url>
     <description>excel read and write framework</description>

src/main/java/io/github/biezhi/excel/plus/utils/ExcelUtils.java

@@ -10,6 +10,7 @@
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellType;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -29,8 +30,8 @@ public class ExcelUtils {
 
     private static final Map<String, List<Field>> FIELD_CACHE = new HashMap<>(8);
 
-    public static String getSheetName(Object item) {
-        ExcelSheet excelSheet = item.getClass().getAnnotation(ExcelSheet.class);
+    public static String getSheetName(Class<?> type) {
+        ExcelSheet excelSheet = type.getAnnotation(ExcelSheet.class);
         if (null == excelSheet) {
             return Constant.DEFAULT_SHEET_NAME;
         }

src/main/java/io/github/biezhi/excel/plus/writer/ExcelWriter.java

@@ -48,7 +48,7 @@ default <T> void export(Exporter<T> exporter, OutputStream outputStream) throws
             Workbook  workbook;
             CellStyle headerStyle;
             CellStyle columnStyle = null;
-            CellStyle titleStyle  = null;
+            CellStyle titleStyle;
 
             T data0 = data.iterator().next();
             // Set Excel header
@@ -66,8 +66,8 @@ default <T> void export(Exporter<T> exporter, OutputStream outputStream) throws
                 sheet = workbook.getSheetAt(0);
 
             } else {
-                workbook = exporter.createWorkbook();
-                sheet = workbook.createSheet(ExcelUtils.getSheetName(data0));
+                workbook = exporter.getExcelType().equals(ExcelType.XLSX) ? new XSSFWorkbook() : new HSSFWorkbook();
+                sheet = workbook.createSheet(ExcelUtils.getSheetName(data0.getClass()));
 
                 if (null != exporter.getTitleStyle()) {
                     titleStyle = exporter.getTitleStyle().apply(workbook);