From e9291da3cb563edd96090e50c3262c3009f23564 Mon Sep 17 00:00:00 2001
From: 25067 <250678106@qq.com>
Date: Wed, 31 Jul 2024 11:12:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?---author:liusq---date:2024/7/31-----for:[T?=
 =?UTF-8?q?V360X-1953]execl=E8=BD=AChtml=E6=8A=A5=E9=94=99d=20!=3D=20org.a?=
 =?UTF-8?q?pache.poi.ss.usermodel.FillPatternType---?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/ExcelToHtmlTest.java        |  21 ++++++++++++++++++
 ...6\347\224\263\350\257\267\344\271\246.xls" | Bin 0 -> 30720 bytes
 .../poi/excel/html/helper/StylerHelper.java   |   4 +++-
 ...6\346\224\271\346\227\245\345\277\227.log" |   8 ++++++-
 4 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 autopoi-web/src/test/java/ExcelToHtmlTest.java
 create mode 100644 "autopoi-web/src/test/resources/templates/\344\270\223\351\241\271\346\224\257\345\207\272\347\224\250\346\254\276\347\224\263\350\257\267\344\271\246.xls"

diff --git a/autopoi-web/src/test/java/ExcelToHtmlTest.java b/autopoi-web/src/test/java/ExcelToHtmlTest.java
new file mode 100644
index 0000000..4de4849
--- /dev/null
+++ b/autopoi-web/src/test/java/ExcelToHtmlTest.java
@@ -0,0 +1,21 @@
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.jeecgframework.poi.excel.ExcelToHtmlUtil;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+
+public class ExcelToHtmlTest {
+
+    private static final String basePath = "D:\\idea_project_2023\\autopoi_lsq\\autopoi-web\\src\\test\\resources\\templates\\";
+
+    public static void main(String[] args) throws Exception {
+        File file = new File(basePath + "专项支出用款申请书.xls");
+        Workbook wb = new HSSFWorkbook(new FileInputStream(file));
+        String     html = ExcelToHtmlUtil.toTableHtml(wb);
+        FileWriter fw   = new FileWriter("D:/home/excel/专项支出用款申请书.html");
+        fw.write(html);
+        fw.close();
+    }
+}
diff --git "a/autopoi-web/src/test/resources/templates/\344\270\223\351\241\271\346\224\257\345\207\272\347\224\250\346\254\276\347\224\263\350\257\267\344\271\246.xls" "b/autopoi-web/src/test/resources/templates/\344\270\223\351\241\271\346\224\257\345\207\272\347\224\250\346\254\276\347\224\263\350\257\267\344\271\246.xls"
new file mode 100644
index 0000000000000000000000000000000000000000..1f3e881890fa4200d28e8a1cdd3faf6ebc8180ec
GIT binary patch
literal 30720
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

literal 0
HcmV?d00001

diff --git a/autopoi/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java b/autopoi/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java
index 464168c..32986a4 100644
--- a/autopoi/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java
+++ b/autopoi/src/main/java/org/jeecgframework/poi/excel/html/helper/StylerHelper.java
@@ -202,7 +202,9 @@ public HSSFHtmlHelper(HSSFWorkbook wb) {
 
 		public void colorStyles(CellStyle style, Formatter out) {
 			HSSFCellStyle cs = (HSSFCellStyle) style;
-			out.format("  /* fill pattern = %d */%n", cs.getFillPattern());
+			if (cs.getFillPattern() != FillPatternType.NO_FILL) {
+				out.format("  /* fill pattern = %s */%n", cs.getFillPattern());
+			}
 			styleColor(out, "background-color", cs.getFillForegroundColor());
 			styleColor(out, "color", colors.getColor(cs.getFont(wb).getColor()));
 		}
diff --git "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
index d6e8939..3ffa1ab 100644
--- "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
+++ "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
@@ -67,4 +67,10 @@ autopoi/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java
 
 ---author:chenrui---date:2024/4/24-----for:[QQYUN-9048]负数被识别成非数字---
 src/main/java/org/jeecgframework/poi/util/ExcelUtil.java
----author:chenrui---date:2024/4/24-----for:[QQYUN-9048]负数被识别成非数字---
\ No newline at end of file
+---author:chenrui---date:2024/4/24-----for:[QQYUN-9048]负数被识别成非数字---
+
+---author:liusq---date:2024/7/30-----for:TV360X-1953 execl转html报错d != org.apache.poi.ss.usermodel.FillPatternType---
+src\main\java\org\jeecgframework\poi\excel\html\helper\StylerHelper.java
+src\test\resources\templates\专项支出用款申请书.xls
+src\test\java\ExcelToHtmlTest.java
+---author:liusq---date:2024/7/30-----for:TV360X-1953 execl转html报错d != org.apache.poi.ss.usermodel.FillPatternType---

From 25c6f6684ed1d58c26257ce1e45cbb538cf56706 Mon Sep 17 00:00:00 2001
From: 25067 <250678106@qq.com>
Date: Wed, 31 Jul 2024 11:13:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?---author:liusq---date:2024/7/31-----for:[T?=
 =?UTF-8?q?V360X-1292]=20=E5=AF=B9=E8=B1=A1=E7=9A=84=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E4=B8=BALocalDate=E3=80=81LocalDateTIme=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=85=BC=E5=AE=B9---?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/test/java/ImportExcelTest.java        |  33 +++++++++++++++++
 autopoi-web/src/test/java/TestDateEntity.java |  34 ++++++++++++++++++
 .../templates/ExcelImportDateTest.xlsx        | Bin 0 -> 10642 bytes
 .../poi/excel/imports/CellValueServer.java    |  10 +++++-
 .../poi/util/PoiPublicUtil.java               |   8 ++++-
 ...6\346\224\271\346\227\245\345\277\227.log" |   8 +++++
 6 files changed, 91 insertions(+), 2 deletions(-)
 create mode 100644 autopoi-web/src/test/java/ImportExcelTest.java
 create mode 100644 autopoi-web/src/test/java/TestDateEntity.java
 create mode 100644 autopoi-web/src/test/resources/templates/ExcelImportDateTest.xlsx

diff --git a/autopoi-web/src/test/java/ImportExcelTest.java b/autopoi-web/src/test/java/ImportExcelTest.java
new file mode 100644
index 0000000..32d9f38
--- /dev/null
+++ b/autopoi-web/src/test/java/ImportExcelTest.java
@@ -0,0 +1,33 @@
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.jeecgframework.poi.excel.ExcelExportUtil;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.TemplateExportParams;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description: TODO
+ * @author: scott
+ * @date: 2020年09月16日 11:46
+ */
+public class ImportExcelTest {
+    private static final String basePath = "D:\\idea_project_2023\\autopoi_lsq\\autopoi-web\\src\\test\\resources\\templates\\";
+
+    public static void main(String[] args) throws Exception {
+        ImportParams params = new ImportParams();
+        params.setTitleRows(1);
+        params.setHeadRows(1);
+        File importFile = new File(basePath+"ExcelImportDateTest.xlsx");
+        List<TestDateEntity> list = ExcelImportUtil.importExcel(importFile, TestDateEntity.class, params);
+        System.out.println(list.size());
+        System.out.println(ReflectionToStringBuilder.toString(list.get(1)));
+    }
+}
diff --git a/autopoi-web/src/test/java/TestDateEntity.java b/autopoi-web/src/test/java/TestDateEntity.java
new file mode 100644
index 0000000..cb5dddf
--- /dev/null
+++ b/autopoi-web/src/test/java/TestDateEntity.java
@@ -0,0 +1,34 @@
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * @Description: TODO
+ * @author: lsq
+ * @date: 2024年07月31日 10:31
+ */
+public class TestDateEntity {
+    @Excel(name = "localdate", format = "yyyy-MM-dd")
+    private LocalDate localDate;
+
+    @Excel(name = "localdatetime", format = "yyyy-MM-dd")
+    private LocalDateTime localDateTime;
+
+
+    public LocalDate getLocalDate() {
+        return localDate;
+    }
+
+    public void setLocalDate(LocalDate localDate) {
+        this.localDate = localDate;
+    }
+
+    public LocalDateTime getLocalDateTime() {
+        return localDateTime;
+    }
+
+    public void setLocalDateTime(LocalDateTime localDateTime) {
+        this.localDateTime = localDateTime;
+    }
+}
diff --git a/autopoi-web/src/test/resources/templates/ExcelImportDateTest.xlsx b/autopoi-web/src/test/resources/templates/ExcelImportDateTest.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..51b3bd28399f6b444eec1bf9f723414689bf8cb6
GIT binary patch
literal 10642
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

literal 0
HcmV?d00001

diff --git a/autopoi/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java b/autopoi/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java
index d41c6ff..bf56f68 100644
--- a/autopoi/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java
+++ b/autopoi/src/main/java/org/jeecgframework/poi/excel/imports/CellValueServer.java
@@ -35,6 +35,7 @@
 import java.sql.Time;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -66,7 +67,10 @@ private Object getCellValue(String xclass, Cell cell, ExcelImportEntity entity)
 		}
 		Object result = null;
 		// 日期格式比较特殊,和cell格式不一致
-		if ("class java.util.Date".equals(xclass) || ("class java.sql.Time").equals(xclass)) {
+		if ("class java.util.Date".equals(xclass)
+				|| ("class java.sql.Time").equals(xclass)
+				|| ("class java.time.LocalDate").equals(xclass)
+				|| ("class java.time.LocalDateTime").equals(xclass)) {
 			if ( CellType.NUMERIC == cell.getCellTypeEnum()) {
 				// 日期格式
 				result = cell.getDateCellValue();
@@ -76,6 +80,10 @@ private Object getCellValue(String xclass, Cell cell, ExcelImportEntity entity)
 			}
 			if (("class java.sql.Time").equals(xclass)) {
 				result = new Time(((Date) result).getTime());
+			}else if (("class java.time.LocalDate").equals(xclass)) {
+				result = ((Date) result).toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+			} else if (("class java.time.LocalDateTime").equals(xclass)) {
+				result = ((Date) result).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
 			}
 		} else if ( CellType.NUMERIC == cell.getCellTypeEnum()) {
 			result = cell.getNumericCellValue();
diff --git a/autopoi/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java b/autopoi/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java
index e8c3fb9..45b84d1 100644
--- a/autopoi/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java
+++ b/autopoi/src/main/java/org/jeecgframework/poi/util/PoiPublicUtil.java
@@ -564,7 +564,13 @@ public static boolean isJavaClass(Field field) {
 		boolean isBaseClass = false;
 		if (fieldType.isArray()) {
 			isBaseClass = false;
-		} else if (fieldType.isPrimitive() || fieldType.getPackage() == null || fieldType.getPackage().getName().equals("java.lang") || fieldType.getPackage().getName().equals("java.math") || fieldType.getPackage().getName().equals("java.sql") || fieldType.getPackage().getName().equals("java.util")) {
+		} else if (fieldType.isPrimitive()
+				|| fieldType.getPackage() == null
+				|| fieldType.getPackage().getName().equals("java.lang")
+				|| fieldType.getPackage().getName().equals("java.math")
+				|| fieldType.getPackage().getName().equals("java.sql")
+				|| fieldType.getPackage().getName().equals("java.util")
+				|| fieldType.getPackage().getName().equals("java.time")) {
 			isBaseClass = true;
 		}
 		return isBaseClass;
diff --git "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log" "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
index 3ffa1ab..ed3393b 100644
--- "a/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
+++ "b/docs/\344\277\256\346\224\271\346\227\245\345\277\227.log"
@@ -74,3 +74,11 @@ src\main\java\org\jeecgframework\poi\excel\html\helper\StylerHelper.java
 src\test\resources\templates\专项支出用款申请书.xls
 src\test\java\ExcelToHtmlTest.java
 ---author:liusq---date:2024/7/30-----for:TV360X-1953 execl转html报错d != org.apache.poi.ss.usermodel.FillPatternType---
+
+---author:liusq---date:2024/7/30-----for:TV360X-1292 对象的属性为LocalDate、LocalDateTIme类型对象兼容---
+autopoi\src\main\java\org\jeecgframework\poi\util\PoiPublicUtil.java
+autopoi\src\main\java\org\jeecgframework\poi\excel\imports\CellValueServer.java
+src\test\resources\templates\ExcelImportDateTest.xlsx
+src\test\java\TestDateEntity.java
+src\test\java\ImportExcelTest.java
+---author:liusq---date:2024/7/30-----for:TV360X-1292 对象的属性为LocalDate、LocalDateTIme类型对象兼容---
\ No newline at end of file