From 3bf0158951cb83c6fe9395b21dfcb6e8c3cf58b4 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Fri, 17 Sep 2021 22:00:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Elocaldatetime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../converters/DefaultConverterLoader.java    |  16 +++++
 .../BigIntegerBooleanConverter.java           |  47 +++++++++++++++
 .../biginteger/BigIntegerNumberConverter.java |  41 +++++++++++++
 .../LocalDateNumberConverter.java             |  55 ++++++++++++++++++
 .../LocalDateTimeDateConverter.java           |  34 +++++++++++
 .../LocalDateTimeStringConverter.java         |  52 +++++++++++++++++
 .../excel/metadata/data/WriteCellData.java    |  14 ++++-
 .../com/alibaba/excel/util/DateUtils.java     |  45 +++++++++++++-
 .../core/converter/ConverterDataListener.java |   3 +
 .../core/converter/ConverterDataTest.java     |   3 +
 .../core/converter/ConverterReadData.java     |   6 ++
 .../core/converter/ConverterWriteData.java    |   6 ++
 .../core/converter/ReadAllConverterData.java  |   7 +++
 .../ReadAllConverterDataListener.java         |   6 ++
 src/test/resources/converter/converter03.xls  | Bin 20992 -> 23552 bytes
 src/test/resources/converter/converter07.xlsx | Bin 10693 -> 11790 bytes
 src/test/resources/converter/converterCsv.csv |   4 +-
 17 files changed, 335 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java
 create mode 100644 src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java
 create mode 100644 src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateNumberConverter.java
 create mode 100644 src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeDateConverter.java
 create mode 100644 src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeStringConverter.java

diff --git a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java
index 02f00313..fda84b84 100644
--- a/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java
+++ b/src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java
@@ -5,6 +5,8 @@ import java.util.Map;
 import com.alibaba.excel.converters.bigdecimal.BigDecimalBooleanConverter;
 import com.alibaba.excel.converters.bigdecimal.BigDecimalNumberConverter;
 import com.alibaba.excel.converters.bigdecimal.BigDecimalStringConverter;
+import com.alibaba.excel.converters.biginteger.BigIntegerBooleanConverter;
+import com.alibaba.excel.converters.biginteger.BigIntegerNumberConverter;
 import com.alibaba.excel.converters.biginteger.BigIntegerStringConverter;
 import com.alibaba.excel.converters.booleanconverter.BooleanBooleanConverter;
 import com.alibaba.excel.converters.booleanconverter.BooleanNumberConverter;
@@ -28,6 +30,9 @@ import com.alibaba.excel.converters.inputstream.InputStreamImageConverter;
 import com.alibaba.excel.converters.integer.IntegerBooleanConverter;
 import com.alibaba.excel.converters.integer.IntegerNumberConverter;
 import com.alibaba.excel.converters.integer.IntegerStringConverter;
+import com.alibaba.excel.converters.localdatetime.LocalDateNumberConverter;
+import com.alibaba.excel.converters.localdatetime.LocalDateTimeDateConverter;
+import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
 import com.alibaba.excel.converters.longconverter.LongBooleanConverter;
 import com.alibaba.excel.converters.longconverter.LongNumberConverter;
 import com.alibaba.excel.converters.longconverter.LongStringConverter;
@@ -61,6 +66,10 @@ public class DefaultConverterLoader {
         putAllConverter(new BigDecimalNumberConverter());
         putAllConverter(new BigDecimalStringConverter());
 
+        putAllConverter(new BigIntegerBooleanConverter());
+        putAllConverter(new BigIntegerNumberConverter());
+        putAllConverter(new BigIntegerStringConverter());
+
         putAllConverter(new BooleanBooleanConverter());
         putAllConverter(new BooleanNumberConverter());
         putAllConverter(new BooleanStringConverter());
@@ -72,6 +81,9 @@ public class DefaultConverterLoader {
         putAllConverter(new DateNumberConverter());
         putAllConverter(new DateStringConverter());
 
+        putAllConverter(new LocalDateNumberConverter());
+        putAllConverter(new LocalDateTimeStringConverter());
+
         putAllConverter(new DoubleBooleanConverter());
         putAllConverter(new DoubleNumberConverter());
         putAllConverter(new DoubleStringConverter());
@@ -103,9 +115,11 @@ public class DefaultConverterLoader {
     private static void initDefaultWriteConverter() {
         defaultWriteConverter = MapUtils.newHashMapWithExpectedSize(40);
         putWriteConverter(new BigDecimalNumberConverter());
+        putWriteConverter(new BigIntegerNumberConverter());
         putWriteConverter(new BooleanBooleanConverter());
         putWriteConverter(new ByteNumberConverter());
         putWriteConverter(new DateDateConverter());
+        putWriteConverter(new LocalDateTimeDateConverter());
         putWriteConverter(new DoubleNumberConverter());
         putWriteConverter(new FloatNumberConverter());
         putWriteConverter(new IntegerNumberConverter());
@@ -120,9 +134,11 @@ public class DefaultConverterLoader {
 
         // In some cases, it must be converted to string
         putWriteStringConverter(new BigDecimalStringConverter());
+        putWriteStringConverter(new BigIntegerStringConverter());
         putWriteStringConverter(new BooleanStringConverter());
         putWriteStringConverter(new ByteStringConverter());
         putWriteStringConverter(new DateStringConverter());
+        putWriteStringConverter(new LocalDateTimeStringConverter());
         putWriteStringConverter(new DoubleStringConverter());
         putWriteStringConverter(new FloatStringConverter());
         putWriteStringConverter(new IntegerStringConverter());
diff --git a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java
new file mode 100644
index 00000000..0ac0e6c9
--- /dev/null
+++ b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerBooleanConverter.java
@@ -0,0 +1,47 @@
+package com.alibaba.excel.converters.biginteger;
+
+import java.math.BigInteger;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+/**
+ * BigInteger and boolean converter
+ *
+ * @author Jiaju Zhuang
+ */
+public class BigIntegerBooleanConverter implements Converter<BigInteger> {
+
+    @Override
+    public Class<BigInteger> supportJavaTypeKey() {
+        return BigInteger.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.BOOLEAN;
+    }
+
+    @Override
+    public BigInteger convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        if (cellData.getBooleanValue()) {
+            return BigInteger.ONE;
+        }
+        return BigInteger.ZERO;
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(BigInteger value, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        if (BigInteger.ONE.equals(value)) {
+            return new WriteCellData<>(Boolean.TRUE);
+        }
+        return new WriteCellData<>(Boolean.FALSE);
+    }
+
+}
diff --git a/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java
new file mode 100644
index 00000000..c5957a15
--- /dev/null
+++ b/src/main/java/com/alibaba/excel/converters/biginteger/BigIntegerNumberConverter.java
@@ -0,0 +1,41 @@
+package com.alibaba.excel.converters.biginteger;
+
+import java.math.BigInteger;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.alibaba.excel.util.NumberUtils;
+
+/**
+ * BigInteger and number converter
+ *
+ * @author Jiaju Zhuang
+ */
+public class BigIntegerNumberConverter implements Converter<BigInteger> {
+
+    @Override
+    public Class<BigInteger> supportJavaTypeKey() {
+        return BigInteger.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.NUMBER;
+    }
+
+    @Override
+    public BigInteger convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        return cellData.getNumberValue().toBigInteger();
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(BigInteger value, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        return NumberUtils.formatToCellData(value, contentProperty);
+    }
+}
diff --git a/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateNumberConverter.java b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateNumberConverter.java
new file mode 100644
index 00000000..f57f0bdc
--- /dev/null
+++ b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateNumberConverter.java
@@ -0,0 +1,55 @@
+package com.alibaba.excel.converters.localdatetime;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import org.apache.poi.ss.usermodel.DateUtil;
+
+/**
+ * LocalDateTime and number converter
+ *
+ * @author Jiaju Zhuang
+ */
+public class LocalDateNumberConverter implements Converter<LocalDateTime> {
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.NUMBER;
+    }
+
+    @Override
+    public LocalDateTime convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+            return DateUtil.getLocalDateTime(cellData.getNumberValue().doubleValue(),
+                globalConfiguration.getUse1904windowing());
+        } else {
+            return DateUtil.getLocalDateTime(cellData.getNumberValue().doubleValue(),
+                contentProperty.getDateTimeFormatProperty().getUse1904windowing());
+        }
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+            return new WriteCellData<>(
+                BigDecimal.valueOf(DateUtil.getExcelDate(value, globalConfiguration.getUse1904windowing())));
+        } else {
+            return new WriteCellData<>(BigDecimal.valueOf(
+                DateUtil.getExcelDate(value, contentProperty.getDateTimeFormatProperty().getUse1904windowing())));
+        }
+    }
+}
diff --git a/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeDateConverter.java b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeDateConverter.java
new file mode 100644
index 00000000..072a7864
--- /dev/null
+++ b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeDateConverter.java
@@ -0,0 +1,34 @@
+package com.alibaba.excel.converters.localdatetime;
+
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.alibaba.excel.util.DateUtils;
+import com.alibaba.excel.util.WorkBookUtil;
+
+/**
+ * Date and date converter
+ *
+ * @author Jiaju Zhuang
+ */
+public class LocalDateTimeDateConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class<LocalDateTime> supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) throws Exception {
+        WriteCellData<?> cellData = new WriteCellData<>(value);
+        String format = null;
+        if (contentProperty != null && contentProperty.getDateTimeFormatProperty() != null) {
+            format = contentProperty.getDateTimeFormatProperty().getFormat();
+        }
+        WorkBookUtil.fillDataFormat(cellData, format, DateUtils.defaultDateFormat);
+        return cellData;
+    }
+}
diff --git a/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeStringConverter.java b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeStringConverter.java
new file mode 100644
index 00000000..56aee318
--- /dev/null
+++ b/src/main/java/com/alibaba/excel/converters/localdatetime/LocalDateTimeStringConverter.java
@@ -0,0 +1,52 @@
+package com.alibaba.excel.converters.localdatetime;
+
+import java.text.ParseException;
+import java.time.LocalDateTime;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.alibaba.excel.util.DateUtils;
+
+/**
+ * LocalDateTime and string converter
+ *
+ * @author Jiaju Zhuang
+ */
+public class LocalDateTimeStringConverter implements Converter<LocalDateTime> {
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return LocalDateTime.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public LocalDateTime convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) throws ParseException {
+        if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+            return DateUtils.parseLocalDateTime(cellData.getStringValue(), null, globalConfiguration.getLocale());
+        } else {
+            return DateUtils.parseLocalDateTime(cellData.getStringValue(),
+                contentProperty.getDateTimeFormatProperty().getFormat(), globalConfiguration.getLocale());
+        }
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(LocalDateTime value, ExcelContentProperty contentProperty,
+        GlobalConfiguration globalConfiguration) {
+        if (contentProperty == null || contentProperty.getDateTimeFormatProperty() == null) {
+            return new WriteCellData<>(DateUtils.format(value, null, globalConfiguration.getLocale()));
+        } else {
+            return new WriteCellData<>(
+                DateUtils.format(value, contentProperty.getDateTimeFormatProperty().getFormat(),
+                    globalConfiguration.getLocale()));
+        }
+    }
+}
diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java
index 4c54b6fa..ed522b81 100644
--- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java
+++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java
@@ -1,6 +1,8 @@
 package com.alibaba.excel.metadata.data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.Date;
 import java.util.List;
 
@@ -22,7 +24,8 @@ public class WriteCellData<T> extends CellData<T> {
     /**
      * Support only when writing.{@link CellDataTypeEnum#DATE}
      */
-    private Date dateValue;
+    private LocalDateTime dateValue;
+
     /**
      * rich text.{@link CellDataTypeEnum#RICH_TEXT_STRING}
      */
@@ -84,6 +87,15 @@ public class WriteCellData<T> extends CellData<T> {
     }
 
     public WriteCellData(Date dateValue) {
+        super();
+        if (dateValue == null) {
+            throw new IllegalArgumentException("DateValue can not be null");
+        }
+        setType(CellDataTypeEnum.DATE);
+        this.dateValue = LocalDateTime.ofInstant(dateValue.toInstant(), ZoneId.systemDefault());
+    }
+
+    public WriteCellData(LocalDateTime dateValue) {
         super();
         if (dateValue == null) {
             throw new IllegalArgumentException("DateValue can not be null");
diff --git a/src/main/java/com/alibaba/excel/util/DateUtils.java b/src/main/java/com/alibaba/excel/util/DateUtils.java
index 68eb01c0..4a297cf7 100644
--- a/src/main/java/com/alibaba/excel/util/DateUtils.java
+++ b/src/main/java/com/alibaba/excel/util/DateUtils.java
@@ -3,8 +3,11 @@ package com.alibaba.excel.util;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import java.util.regex.Pattern;
 
@@ -69,6 +72,25 @@ public class DateUtils {
         return getCacheDateFormat(dateFormat).parse(dateString);
     }
 
+    /**
+     * convert string to date
+     *
+     * @param dateString
+     * @param dateFormat
+     * @param local
+     * @return
+     */
+    public static LocalDateTime parseLocalDateTime(String dateString, String dateFormat, Locale local) {
+        if (StringUtils.isEmpty(dateFormat)) {
+            dateFormat = switchDateFormat(dateString);
+        }
+        if (local == null) {
+            return LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(dateFormat));
+        } else {
+            return LocalDateTime.parse(dateString, DateTimeFormatter.ofPattern(dateFormat, local));
+        }
+    }
+
     /**
      * convert string to date
      *
@@ -86,7 +108,7 @@ public class DateUtils {
      * @param dateString
      * @return
      */
-    private static String switchDateFormat(String dateString) {
+    public static String switchDateFormat(String dateString) {
         int length = dateString.length();
         switch (length) {
             case 19:
@@ -141,6 +163,27 @@ public class DateUtils {
         return getCacheDateFormat(dateFormat).format(date);
     }
 
+    /**
+     * Format date
+     *
+     * @param date
+     * @param dateFormat
+     * @return
+     */
+    public static String format(LocalDateTime date, String dateFormat, Locale local) {
+        if (date == null) {
+            return null;
+        }
+        if (StringUtils.isEmpty(dateFormat)) {
+            dateFormat = defaultDateFormat;
+        }
+        if (local == null) {
+            return date.format(DateTimeFormatter.ofPattern(dateFormat));
+        } else {
+            return date.format(DateTimeFormatter.ofPattern(dateFormat, local));
+        }
+    }
+
     private static DateFormat getCacheDateFormat(String dateFormat) {
         Map<String, SimpleDateFormat> dateFormatMap = DATE_FORMAT_THREAD_LOCAL.get();
         if (dateFormatMap == null) {
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java
index 411700f0..0a71d25a 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataListener.java
@@ -1,6 +1,7 @@
 package com.alibaba.easyexcel.test.core.converter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,8 +37,10 @@ public class ConverterDataListener extends AnalysisEventListener<ConverterReadDa
         } catch (ParseException e) {
             throw new ExcelCommonException("Test Exception", e);
         }
+        Assert.assertEquals(DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null), data.getLocalDateTime());
         Assert.assertEquals(data.getBooleanData(), Boolean.TRUE);
         Assert.assertEquals(data.getBigDecimal().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+        Assert.assertEquals(data.getBigInteger().intValue(), BigInteger.ONE.intValue(), 0.0);
         Assert.assertEquals((long)data.getLongData(), 1L);
         Assert.assertEquals((long)data.getIntegerData(), 1L);
         Assert.assertEquals((long)data.getShortData(), 1L);
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java
index e709d9be..b2943522 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterDataTest.java
@@ -3,6 +3,7 @@ package com.alibaba.easyexcel.test.core.converter;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -112,8 +113,10 @@ public class ConverterDataTest {
         List<ConverterWriteData> list = new ArrayList<ConverterWriteData>();
         ConverterWriteData converterWriteData = new ConverterWriteData();
         converterWriteData.setDate(DateUtils.parseDate("2020-01-01 01:01:01"));
+        converterWriteData.setLocalDateTime(DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
         converterWriteData.setBooleanData(Boolean.TRUE);
         converterWriteData.setBigDecimal(BigDecimal.ONE);
+        converterWriteData.setBigInteger(BigInteger.ONE);
         converterWriteData.setLongData(1L);
         converterWriteData.setIntegerData(1);
         converterWriteData.setShortData((short)1);
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java
index bf7af176..8fa78f7e 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java
@@ -1,6 +1,8 @@
 package com.alibaba.easyexcel.test.core.converter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -15,10 +17,14 @@ import lombok.Data;
 public class ConverterReadData {
     @ExcelProperty("日期")
     private Date date;
+    @ExcelProperty("本地日期")
+    private LocalDateTime localDateTime;
     @ExcelProperty("布尔")
     private Boolean booleanData;
     @ExcelProperty("大数")
     private BigDecimal bigDecimal;
+    @ExcelProperty("大整数")
+    private BigInteger bigInteger;
     @ExcelProperty("长整型")
     private long longData;
     @ExcelProperty("整型")
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java
index 009fae2e..68c34423 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java
@@ -1,6 +1,8 @@
 package com.alibaba.easyexcel.test.core.converter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -15,10 +17,14 @@ import lombok.Data;
 public class ConverterWriteData {
     @ExcelProperty("日期")
     private Date date;
+    @ExcelProperty("本地日期")
+    private LocalDateTime localDateTime;
     @ExcelProperty("布尔")
     private Boolean booleanData;
     @ExcelProperty("大数")
     private BigDecimal bigDecimal;
+    @ExcelProperty("大整数")
+    private BigInteger bigInteger;
     @ExcelProperty("长整型")
     private long longData;
     @ExcelProperty("整型")
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java
index 4f758a02..cccee710 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java
@@ -1,6 +1,8 @@
 package com.alibaba.easyexcel.test.core.converter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 import lombok.Data;
@@ -13,6 +15,9 @@ public class ReadAllConverterData {
     private BigDecimal bigDecimalBoolean;
     private BigDecimal bigDecimalNumber;
     private BigDecimal bigDecimalString;
+    private BigInteger bigIntegerBoolean;
+    private BigInteger bigIntegerNumber;
+    private BigInteger bigIntegerString;
     private Boolean booleanBoolean;
     private Boolean booleanNumber;
     private Boolean booleanString;
@@ -21,6 +26,8 @@ public class ReadAllConverterData {
     private Byte byteString;
     private Date dateNumber;
     private Date dateString;
+    private LocalDateTime localDateTimeNumber;
+    private LocalDateTime localDateTimeString;
     private Double doubleBoolean;
     private Double doubleNumber;
     private Double doubleString;
diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java
index 4a11f8b8..8516cd5b 100644
--- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java
+++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterDataListener.java
@@ -1,6 +1,7 @@
 package com.alibaba.easyexcel.test.core.converter;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
@@ -35,6 +36,9 @@ public class ReadAllConverterDataListener extends AnalysisEventListener<ReadAllC
         Assert.assertEquals(data.getBigDecimalBoolean().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
         Assert.assertEquals(data.getBigDecimalNumber().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
         Assert.assertEquals(data.getBigDecimalString().doubleValue(), BigDecimal.ONE.doubleValue(), 0.0);
+        Assert.assertEquals(data.getBigIntegerBoolean().intValue(), BigInteger.ONE.intValue(), 0.0);
+        Assert.assertEquals(data.getBigIntegerNumber().intValue(), BigInteger.ONE.intValue(), 0.0);
+        Assert.assertEquals(data.getBigIntegerString().intValue(), BigInteger.ONE.intValue(), 0.0);
         Assert.assertTrue(data.getBooleanBoolean());
         Assert.assertTrue(data.getBooleanNumber());
         Assert.assertTrue(data.getBooleanString());
@@ -47,6 +51,8 @@ public class ReadAllConverterDataListener extends AnalysisEventListener<ReadAllC
         } catch (ParseException e) {
             throw new ExcelCommonException("Test Exception", e);
         }
+        Assert.assertEquals(data.getLocalDateTimeNumber(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
+        Assert.assertEquals(data.getLocalDateTimeString(), DateUtils.parseLocalDateTime("2020-01-01 01:01:01", null, null));
         Assert.assertEquals(data.getDoubleBoolean(), 1.0, 0.0);
         Assert.assertEquals(data.getDoubleNumber(), 1.0, 0.0);
         Assert.assertEquals(data.getDoubleString(), 1.0, 0.0);
diff --git a/src/test/resources/converter/converter03.xls b/src/test/resources/converter/converter03.xls
index 3373d81ee35119586d3f2bd033893082c0f67776..89c2ab6ef1df774087277205411c35b9b14d306f 100644
GIT binary patch
literal 23552
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
Cd<ks;

literal 20992
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
VF?&Gn3V*%?f5Y)l`cGQmzX18|pr8N%

diff --git a/src/test/resources/converter/converter07.xlsx b/src/test/resources/converter/converter07.xlsx
index 92b93e20f4b822c9f121af369693f166c5b5305f..99ace690b915983775359cb1d9680ca664234860 100644
GIT binary patch
literal 11790
zcmeHtWmFvLwszwVjk~)`AV6?;2oeYuAV6?;cMneEZo%EX(Ez~{2oOBDhu{IePUf7O
z8D{SH|E_bYS5>WEU3;&$-+G?y&lO-`aRBfDL;wIl31DGH8wh{`0J7i#0Bisvw627m
zt+T1Evw?<(y{VHvo4buQMLsMvLoNUs^89~~|KJ_?0Mb|J<G=|$hI^10u56g63xD6H
zuh{u9;0&Svt23)YVqD_b;fhzf4}}`<AhPGo<W}aT&o>9<unm{WL|pfZieYV${aV<!
z4P{(snVl2aGhWGtKxrf!w6E4M?*|L^%h#+o0N5i>Q|q~4FMIe$uq*@8Tnx>NYr60P
zUfpF1P~yKv_nzEea<EVWU{6n)*G!#YBG-PT^w62vW{p6IW=XS#A+F9u+IFUuqEPGN
z+6z-?b9&G4WYAEXzk?EWP?t14Z3WHMqq>2oOD#?@1cN=F4z+9c$IQ(@SYy;di!4eJ
zYovT&oul>)y2*|pVhF8hi3{FP1s-VLiTpGc{C;Edn4nPG07p2{_(X-z_92{l@(zJ4
zCxu)tiQfT0@RX=#--<v=g+HY?$P*>|nbbC5rBTIRHgB`AFk#mn8@+AlM`_Hv<!6O4
zTWj9_KBJa(>N4W15^!O~pEQ3U$n1sUR}-ZBmWyWXv!)PO`_$fP77t_&<&5s2000jU
zFo5TOVJ`NoE>ma-b5|h5M1e5Zz|qv&iJk4|^}me$52op#{(41%k^&4TF!VU^f$~GA
zz#<dXv^Bfbj*`h86ldC<A#Yk-VcXrMw3u^V6PagbwOh7F+WDKh0`~%-mn&AX6jEU3
zo0)daUWL1s76i;hN9pJT+1>yu>$3gw^C!_vn|Ytlg(EB0^Ml!FAN&biWHbi?g<AD2
z_+Ek>33R^8W0cYAfi_7)SBRdEaSx2kA__Rc<O^SQTz5R>RjRfa^|Tu<qGpaOmK=}M
zzKWX{-#g>U*UT%T0oVAB?1qorQW?XL(d*ph>>OK7si{fRhNQz}ZCxMm!8LRgN;zTs
zeMyt{-sb4w!g%-6mVG$?lCxIGcwB3O7i)aE?gp|8f2Yj%a|8iw2xYWk0RSQZB9yx|
z`yZ@vvvah1ZD(io)7|}>K~NB%2YL2C`{+oTu<YYN9Xt-|44U$BNU+r>bn*O5@V(6i
z!_b-*UFpEk!|&V06Mh<$qysEZPTAg-ONqJ;ksl3cx8f>|_0V-RaG{#~`it^CL%Zj;
z2yX)$be@jq`;#G|4;+r&qY)FX({j1Uu#~;TG8Es*=A$>Q0VTDd+f*ctH*@t*YIP*;
zu`qx2NVjc$D2EzQOeAdt_<bZceAg8<{$SN!SApBbcRrtwhR<@<d}hWKP8lh0U<BkS
z4#xl~VMPQOgnH;<OAkv65o<3Zy-{Qp`>J&$+Xb7bPe`X5IA4V%A?^9`7(DbM*Fv)X
zJJyH3GLAgE^{wdY<WTqFdtaqn;3XmbCFR#X{_&s*;ox=re}YuDlZhQ03;@uN003Y>
zumXY9pTSi4!p1J+8P2_L(JgsgxB4Qid7%8eBBZwXwsLdb#aNJ4<|-b?+*7p9nfu!q
zIoX9b>22t=zCwb&<NOnxX5?*U-^oIrs(oV2r-${(-(pHRe<r16@Wk(}ps{vVz1k-#
zDV5$_jBURMmnPMlHRVzS41i@~e(wSu`16Ul#)r%j>5nz_YHhFaian#13gAYSD1$5I
zNq|@zk;6nbm{@mssEs;uY;Pi)K_!QHl2HlTxpv6&sZf>cb^+z7zUIU^<z-Oe0^0Jo
zAA_i>*N0#0Gmjm~+qW0Q&skgzoV<fgH{?TViis(snHwnq2|<~6(E5B8p-r8}r`(A#
zK6zRQv^r(bN58Ca{-LaSO2#bguljAs9H;P;6>Y$3CpPPX6UyZEynOPyC$oMm&scYb
zV;WPu7MJmMYXg<a6r<uNX%alDue(iYO?AQg@^svySKjQ~MWIMv?~N@&s?u=r%bF+}
zNzX+<FJgUE8GyBy+CS#xS#w=Q#aGcA-qIh8v!t<hXr?gsYQg{Ld%$NcpSw(0YIcuD
zY5KVL%HFERa7)fvFX^*+468d56j#|NJ%SG}&_d8`SIyK+hg?pHUz>gzK$h@s61E<y
zHioO(F#&#^w!|2Wny01NMDYs72>^c6hhx`6mu}{nL+ZSfhIV|09#l#`w*4_@qW3d-
z;^}+x5X@-hdj4yI_~X^LG1yfvt)lcVNS!0aWzVN(>1WXdl4vSFU~qTEFKx8nzj$)s
z<A&bub)*v+&A-#H)OjR5+q&?bObBfw+}|(5cSCxsNmiAEjC}SU(@`IwOB7sNj!4R<
z$><4w(`1?m-e})~BmVJL*)IdSvg>lM3%aX?IJvj+@J6^N_o_cD51-%Vo<zIPw5d7t
zbh(W^ntFfgi50<drA#LuynH6eyHsfIoQ5t57Tb*SnU{t2O3(;xi*WRyI#)WZZ|c+s
zjNRa?84Hq|DHdX>ch0Vyv0N!`mql{V!dg7H;kX9x76a$;kOy$}MO5@M4mB^M$`5<l
zD%eM8t_7W{4wmmhMy_|#eWTZNiy0LdYbtU^;lv*ofkJ}b{u6!>;{4rOyC$Jh1VPf0
zD&n81$uDX-o15C0vj4hr{<PHx+A4O~GC18@du{}Wq_63lBB)7l1fE(@0%=1dH{6Am
zNd?>M(+TOXLRZ5zN|`EKG|D`8^DLua)tEuPX`yPWOsBXvZ{FA(_Zuf9$==D}&|Vza
zEk9gtb<Rhn9MPa2VpB4z5Q|-VGm6rndE^wUQnySUX6mBFY49By52{Zi4obqO%&zzy
zQ@v8>ltT=>E7j|ZrqE>4)zwL$WHI*0HlqnKgJHv}SS=4vzJVqOECsW&rpPxI!On1t
zGAjEYoP+&CVTB$}-=!D`-E1DgT%pa<3of7%6v^*}#6<{=1@IB0HHolT1(S^8VVjfJ
zO9KvWe&i|~l>j(da0Sg_Y0t1(Dh>2{t*+^c@eWuItQr@}E0w$0S0>5Xh_k8ol+uy~
zKsO;{j6N`imSl6b&ANx*lCq&zIbfA4S)|fI<Cd-bdD?*a*s})RBFobCb(HT~TP9V!
z8Do}0DFawM6t}fpVFs+9n21Nwm;G6~o`qF&^XgQl2k}xwRgbL+;O{j?M)BsRPC4_1
z&7vPF3O)%z<y-vLs|D4iGZK=PM?q9PRiusTUWPZI6KLl&1?3OVRbd|ak&haNM4Y49
zei|Fc3f?_>wHLb`XQY*O3}yKFq#{os#uL;C&VtLE`R3{zAu-4)+;RE+WEmsu@|b-2
zc6r+IsqGp!ldbppIlZ5^1ODCp*HJADk+Tg`%!hq9jO>RWrR0c&+=)8_+p&ILH&+7%
zu?D_plQ1j57Oh}63vrq@Y4k}p6;WPe0xidB?01V((VQ->s|4m=vdu3J0M*f)XKU&G
zJj+T@1APb`f^CQI+wh~}^U21w*88DsoyODk+|lf%&X``d2*^{5IB_zqyK*jHp4zT`
zbg=PC68n@1TV#BzsYt@<MxcxvBP)+HJ#iHWjCE~ha5-pGk^s|^GdM@((-pr;bhem4
zDx5E7P4_n#6wU&Fim_?3%cnCFuH+r=iV6<y`9STR!ZGwV<y3a9U#2b!Ta)|hMaAo!
zI4@&NJO`W7o*7IdlEzy}`IYQ_=<lq2cgUfhn=ZFciRszY7@mEf>WJiLr{cY?!QG%a
z8&RBT3BMCXr<CMeSQ|lD*|H7YIbKD`WOKe$k|%K^H$b$Ve2-~?M{zSO>+bE5X3tAL
zWbGeO%JqCYOFnDzyOL>!YRTg9$i-KZMSqD8DT2B(k>^xjx@#ou)>YdiD44fmOWbg8
z^h40^&u~3e*>ZgJvq7&*rt4oVIxi3R4tj|aE~*<#SIN(KDe(E<kiO)W2uMSH7xWUZ
zZ>VF;%|5>84F;B;kK~IE{0-Ebi#kGT>a@fdnvs@Zk13Xn)?|`A8)*&X%J#IU<(}xZ
zAc@zFW4EpzMSOP3!>PMZxSkvaPesz%tG!{yUyjk9mv5Z3uCg?xPG^jau~Y|v!_LaU
z>mSo6=P7o=dPaCs?;8&|jt!-67LHu;a$2P7h1Kzg2`=T1s4Fi!Vn+t$5?`hT#}CPP
zx(W`;z}dPeU9h%f^~*`Qg5VD5mc5ACmEgD1Qk<8`<YbcZ5)+Gdaxp)akA4D#@L9pa
z5P;T<69VRnZ0R_oRu>pGdPDDOhpl^Ew#M2-SVrw{jShw1)u<zIQGTLJu0=yTW59q)
zP6sc)@79B>&jvw1oqh<!VJ-)v`eoo4%FH#Ia8TqiJ!`LdeI$fR!CvHD82&lx7NKNF
z`Za#gtxHLuun*JPV4nu;9bDCRL*p2AGvBtHRtL@#zV;Yxyp4`8dpKDpbs-so*&~Ks
z+7{97xfxon1z&bwa5DNym*MnX`4vYBtE?iwE~*v+_R`k&$ZlIvuZj<lls(6rsi9t7
z|L_q#9Is_PWC*BX|H9@TrLOv6F|(dqQKyfl)YT#wHsnlpATW-UL4ocjhEj8Uf=wY|
zGgwg)w;z;-+b(l~w7*C6a>mTd|23kEy3#i;LwlKxiMwpG=j_u;<06e`wZq;E7ou(m
zO#^keDxae?kfplqaXxmM<?NOgZ?2*t+%m@M=+<s=zpBc<Dj8d)LfRFvzgNZNdfoey
zyhOhXr4bi=i?aBNGJMae=~T2$bm80Qpuu6b1;gn=>%IiHX0v5!Fss}0uJW~b@;ylT
zGHEdTsTrF9J^soUpX~9^ts$hk_yYQ|rIZ%2#U-|}bU|+&-g+2mdZ!I|HG`)zP8JON
zlNzc~j(Qp?6$vi}U}(Bss^;77>HpDZU7}IAl0d@2UPyHf?GK;j<m_Q>>h#lF^=ppC
z%y8f=QJ-QYU#1DBCpF0jGGxh8qaj+rM^t9;RfdqqZ^Wnp1zcIK5nU_H`c^owa=<PL
zO^iW?soFIbhq||!UfxHI#3DAZGFlpQio>wC^kmW+TV;lhpw+pQv?t(_r;>QV%yQTr
zMLfRg!oE0jZ$@_q($#_h;<HGvh}FmRn#bof;%+2gX!NodO$QRB?tyf*(i8HVGGN_c
zCWzYuIU)pt)7~FLQ-%AsmuBikL=rTaWTx3fg~Y!%Gh;60)^?O_Je5c&7$n~Z@Oa8h
zOWU0yCR@EIpUwnSm5(HBes^tCciT(&;Sc-%QsNu+97;?B?@hLBUimI={lywL8;F}{
z<dbwdZ0wCF(cJMQ?wVnB>=O4lt`-rYJra6pv@Df*^ZM5QyW<t%=JHv|IYZlK2b_hM
zRyN&g9DL@)&a4(PJ|e{lh=a|fQ#)%P)lp6bq%gKDK(iDehc1!Lo@_4IX@Zfd=d4ds
zbA7#AD_7srIxD-W9kz8>yt1e}4>GR-+aS%jmpVgbwVll&Y_TN`W+ua%ST*S^+7&Qe
z=`k7Srq8q(niSEj%~meO_yQaqN3KH-w|F-(UDc^tG1EBAqypDo)d(MlQWTQAx-Zd0
zBbhNXmISxuE!2F`)JIoe0LiP1!%K9<_=u7OmiW<2D_vs{lB|Wzv@<MXQ>eZ0zICKd
z)-XH#^u}vPxi{84XtjG1-TFIaz{=uP)Mr%h?)vw$`X^4$HD#n4dCBMTlupLZ&tuui
z*W?e;BuCLULWjqdb!%=({k6Hnu+FW+2)sTu544*>MZmERhh~i4#Ucs6HJA*vfhF<l
z-otHID-Mx8G4i$*7$(<6Ur0S8vgNyyCLY83aqoO@(#AIiZMHr}ugsSp|0H?~g&sL)
z0zb-n4{rGkBM4y|YC`E&SX|+1tzzqhVfU4F&W{1g<W+E?LU*SG#i7yBjNyS$l=sB2
zboOzuF_#0~hU!<7cygA(wIAFg`C>;?LOHY(=XXZ|^}{kx`d~K|k2)6kx!(rLaohzV
zx@`x0U7f|>LsId-hkm5OYB{7o3(k;V3I3qb&#cPH+|<<BiT&5@$xlXQCMekjaiE4C
zCti@}f3fg)or#n$w@`0fF18@w1}a9#V<iRqnlJd}<S}RU7g<V**Nhnpc$h_Xmc7TT
zNR)oZO%#&kk4Kl{nKd1IX?h|Wai+K3!9}Fz36Q}*Tg;dr{~XN>B`6l?%E;PTjXjvj
zAm+f!#bf>*XOQXWbfzk;ob{yRR_+B0dY@Nu%g67svIn%N>NsjW^_bDnhp|8u+{>5U
z%%+FR+_Y?9Mq6GbQp5sFNt3#S`$;iIRVwYu##+JhnqwdCwZH>bVb1YWMkO<H6E(G$
z8;WZ(vTugc!wyyElN_cJL+=cNBj`T#YBu4!OApL}aF)(1u26{$klK%p4jtwT<2~fN
z`?@h#1uRoI5LHo@j=tXJooTb3hAvixhfo#8Vw#?5(`Tz730&H#=&-&SwAL9yb_%v(
zAns=qVC~XLa6nKgzDa0hSN&dcO@h3vac`Y@(ZpNt1=Y$XB&`hm@v8v&%iz^9j>{^s
zI>@oeeQbu<Imo;Fb>WT?L+%wtm8!;a1TaU2PwozaP{ekSq%&LtpCP4{?CjbM9NphW
zJ@{72aq$}{!*`m9I74Y6-fJSKnzCQZX};vrRH}5yHEsxS3Lriwvv2)OMSx*3&URzP
zi)iMMa;q5eTIT5#kxb$h>cdj<kGx#fVV(Q8-$(-q)Gu}lgmWWXr7m`5&#~H*CBKgS
zW1_y1^Mxe{0w-Pc{}ocdQi{w(eY=dGRc`uok(XU6A7rq27z)dty(n*pvfOX7GDZhS
zMyJ^%Xh0Hn^x#<KT`3LNEyGtL$Ncx7zhpH~A=D_RGZn1~=E5==IcguO-E3?+xGF@P
zb&Rxf;TC?!CFxvT_Ff=~UTVkc!KTq*D=NBl=}pC^H9y)a4n=;z8MK4|>nQanu!swB
zqXG>FxKnV2u(7<*`fx&UPUgd<B{nC3D3M+tRzP*GFiKHY_UVg0>J!0JJXBnzg?@**
zN#^l_hfKyE#WhFjEvtc<EX$a}r-n1<27DHb6%NHGPBisS<0+ff^XU$p32gh_$k=SD
zAwkyo_Tp0H3XFO&73P5h<iVBFF9r0UT9{-{i-`G+osc#uaq#qYcRRNa(^lE*;?_Pd
z{4T6`)GeK4!@C53!??Dy+~0q8Aiw}5o1`f$T*^t~yw$u4)`z0fr#Fw+bNBE^c+ONb
zQR3PyfQ>rkAB}Fe0Y0o<oSH~B`2r47?KU}5Xy{K&lmHWNz8gRPd^twa?f(Tt28x=M
zBnXkTjz~Tn?qi((;fx+5<jC0_T|j|eU@DS7$A)l-ynoPGE~g;5(J>|Q`XM^{RM1V>
z=A;W_U+orBlKB@rlaiH`p~Zk9)%hFJ1(-Y1Qco1sev~8L1MaO+vBFV;;1N9$=Cb=h
zT3lp(dr*1%^U6b{-<i9zJ(sFO?Y&oyRpgiCc#&mdCzuPo<B&85RhHILMM!t_fFVNl
z@*RT12*&rq(bGnjL?NZidd#17q%Ea%)zz5OD!&CZz4uf}P9mk{*H&{#Iv7nTy94T2
z^5~ArA5PA?7P^{PwW|p<@$8h?T1}2bRElAs8F6Kbo;4$AGw{14^=M~Bu!;)eQ)PY)
z0fN_(f#CHfAb2AN2>z--891sX4x3ROf+)Q5IUgEZu3t1jiY73(hdMzOkoZ2>2$KVj
zEq)lR2AA<((y%m8g~qlUx<K}eADnW$tUq+QtchrW78M*(Cl>#tLbaM;C|<p6s~IM{
zQ@h(K3$(3Rt7a5DPHa<%5)pcC5`a}84_Bli9Z<=i7lzKD7g_+jQ;V&0DY83UVRCU+
zF~0l3^;!A%?1izz5^lZC&>#f2x@+>~(j2$s$?vW8yC{A$m9XZENQYN>DM*vd^xqdS
zI_3Pa_)Gg$PxL*xz*o%j{qY=jUW#n*z@t3#SBayg_742O?iRjLMZwfXvmT24vV}sT
zm9YSDrAx^&TlEMpr^CzjX|5DaKY0f(C(HF~e!_u)W_FCAHP_mC1~scJzs7+K>kn?j
z-o72ao!wxzGk=enC&ad;n>kf>|CbC`qu_epCZrGz4}midWZ{qsqm#Ljqp69yv!jKr
z*{{g50wkug$bmBi@q?sPD`2?>B}Cda|KJAVutONh%Di|Yfv7ACy#W0|8a9nj#mH>B
zZWb0HB^p2?19<ww<{qn3i^L8t8`-Y@hlktF?XTAZ^H(^t(XljJPz7vtno1@>9ivbF
zM{PTI?Uf)N6Z^H9G6S=u7V}v9hP6)bHG4KxT!q#sOL574f;0K(U||DO%slydBZnQ7
zbAsd7WCQ)x--sxwDvTGoS5_x67`T{N@_MDJUn~T}lVjEKFS(miPpk!OBdXkAfu7#X
zUrO)`#@%5fpiF@M3NtGd>lR^6i%hdFmQM0lQw@#o72&U*5q)*bC}6+k@S}tACPh1)
z*_vo@DZbhSu=cU9URk-G>b`280edw0!D;E7K+)oR7#@y3*$eb9*foz^X-Rq~vl=m-
zhI-<{-A~SI%Tv%Hv`xCHjYsf2|DfVlGT%eSBOh)s!8YqvqA6NAso{h$*FD|T)z`(6
zIcB{N+9gLe*R9lcF)7#1i6S;xv%;NZ9)+M4po91~uO^EO=HjAcBc1(3P;+5Wfoiqt
zvqUx&3D&YwB<8>oSL*`~re#fi6KaVADa!-3rs18wROuEz0J*u-$_Al%6!r#rfJHgA
z?p+<_xnR!&3s(6<svD%P{Pz&a5l`BH<o_Qcas3e@4ci8BKzcx+8}#Jke$nX?vA7aT
zT%P8#JxA9M0L>1HMHAIeZq<}%5&g80AqawGU1_xs&b2AfHsF_4FG34c!!a3(ovKDq
z{d`%1WZqU3FufCJet!bR^6JC!@pRTxVqGY{uSg?rS{$pC5o;@;<ql=%a(^i2MHh~<
zE6G{g_-`$#sKxQ2zLQj|I*E@<wIXO^;0wYZBSIP>rG$rd>GIV*UC1_1&<{%dXr2Dd
zP-m8`b}O)50%1V5&g2D?&5q7h*X2|&R|D^T#2rb_wDY|f-Ei8JCcf?0;jb^xYVHWr
zFh@M6YaYrurh*ARf4hL5D7k7%$PdfL%`w^_Hku)uB}<Vb$~L>A|3Mz$CsT<O#9=u$
za5Zqoy?qY}km3TU`cyFK&Kj^M@WZk?ucRyS=5*{9qCpdwO?f83_JfA2H<Rf)?z8I|
z+g0E4FViRTa-;3dwks|>_m`MY>Kug~*TH{OFn^hq|FaQN$1Bh&48+j*K~Bgh2$YGP
z@pDHzdna~d7bj;so1b8UG?xF{7K6Oy%*j#9U=AGkRiC_LU|nnkqw<S<iBD-t_^i&)
zydoUv4B2R=H04)12|d$%Qo<fiPILO2jxC|1>|YV-gSjbzh+|_E=cR$wVL~I6CwX%c
zB803=Eyx(n=Z9!su7k+<g(nnP3tA^6fvlVtKUg%56AAWH-wu`v_fKWj5XuZonO#)`
zqo-okfxR!l3?>hJSBD^lD|UVYUyJS7uup?+JhxyijxvfcWM60PMHj+h;1VvYyxc<W
zdR2=I4Sn#_h9!KAb``_}(=_p1FI*KrZ;!|Wj<d-RjzlrNQl3bgCM(|dJhX&T7U})u
zbRJ!d1YK`XA2dq{yL_weAvWjl)`-UD8Mpv~8zD$e0Q@s{jO^|I3mgby{&i#~irFr5
z0HrSB91#L;Q|t6$L&P{45^%J+OP~bi>p#Ayl23#-qxvkQz^jk5gVwfZLzFwTBP&kQ
zD#yDt_Tk~mlSFOLyZKxj1xX(@BvsilUaY3p*+@Nn@w|P8mr8;wk6Rd?p`Yw|=6<4<
zW!h_)2ol3VOehppY#tQGso5GHJ|q4bwSfknew&5&FJFxJnl@bOBGQ<7_|h540Oc7}
zG9+>du<%*$?92&mhQi$TefoNII&FxKD=3AFx*VQLy~Q=<9c&ZD+&{2112gkCF>dJv
zbgIN$JkxUgQU>B7W4pp`<02CqeizUNKT~OEp(kFcqtjr>Sd6-4_G(qpgd9yAK{I@o
z#tfR%(2O{}>jF(}8bhS(?&f;)a_(5ZPWZ!(qc!Q=QDgQcJX=h(eoqg$mve0)9^uDx
zR;7G=|83*dY@;4hdrcmI(vUa8^sDqcT_V|`cYBxp-hP;!Zfn@fPxsv|5Xta;1vSbS
zXc(?z(D5A!O01S$zUjZ0vgw5%k(qGH^I~x8TgiQAmgt>*HWvFvUbxfi?pM0-c*;iH
zjh-nN^76(ZClGQ%qAz13Yhwv>BMaM~z*dX_BlmIuB_SggzzbV-FJOGJ6s%b19zw9Q
z4fJraNzl#;F$U`^_$@TS;=>hi6h576JdSla5o|&PBsu_Z_%0ua+0SyDlOy4J$K@T*
zmd~2oDQgN~4Tx6sYzdMUnizAMSFHzYB%3LUZL7^Nc*vI^G==lK&wo5u4yE$1;-O;X
zTP6ZlWdhdx7|ndMuEp8>B-vEj*dc5EJ59HQ4Ps;=G*yC-81v6GHMVm!{Vz`;d-kux
zJK;~WZax`>Qq3VvFd%(?oP*~bD8svW*3$`+?RQ@Fw&iCq?0vUe!%pbK+qz4V<c3+6
zN&)8L&tat-)Y4o6G(S;g=fC%`rLoh2fm;ZWIQ#aE3ZE3aGDK$4)vyy9A1=W`(HU;R
zeTDOF)@T1MHY7Cc-nPc{Tl)s9FAk@JbN=e$RkiRFw3j5u0S>%aQ<#hc;Rnk$PXL8I
zlm74<q{T=B2KpG9?IP@`!`kZ1-TS?YGD}WPIAQkIc3DJGJ}dM-Pt9TdA`Ox+Rr*S5
zxo-85L^pj!(A<0pHMN=Jc-tLIgKhM6Z+G&lK>p^NJzH09oGGuLoAyFqQWTu<36x|f
zY#&@y>Ev?JI^!kEWllvZ63P)$R`cIGbdv<!n4ht87ICHxIIB&))mKf<##ZrnJh{Jz
z8c~7l;~(&Yf@X!JE&n`j`tRNT_x&G+PoFFNRl#4U-u^B4^WFw=J%5^kdo1|Z*`GfP
z9zuG||NA7+V?B=tK7MNwMf#=Z&*LADg&()He+y@z{t|xN;C`&&aev{r0u@M${AX(T
zKi!7MqK|8;zeSVr{%7HTtFS)S^0<ulTgxt_PzzbW<2voHqS|9Ek8|4JTJlN%_#2Ni
z+{YRor$4_nw37ehI({WXkG1?Y<o&G!GEqqd0Q^G${8+(X<DNe&kfHgLf`3IpkEI_w
xm*4UfkoMAJSMyl<ug3hhEC6r>k^a5-f0_2@3UCmh0|4ldPZWeJHcUUi{XYbK<j(*A

literal 10693
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
SPcI2{khrINenI~H-~R)L7lZl$

diff --git a/src/test/resources/converter/converterCsv.csv b/src/test/resources/converter/converterCsv.csv
index c61f06ca..01bcf2ef 100644
--- a/src/test/resources/converter/converterCsv.csv
+++ b/src/test/resources/converter/converterCsv.csv
@@ -1,2 +1,2 @@
-大数的布尔(不支持),大数的数字,大数的字符串,布尔的布尔,布尔的数字(不支持),布尔的字符串,字节的布尔(不支持),字节的数字,字节的字符串,日期的数字,日期的字符串,双精度浮点的布尔(不支持),双精度浮点的数字,双精度浮点的字符串,浮点的布尔(不支持),浮点的数字,浮点的字符串,整型的布尔(不支持),整型的数字,整型的字符串,长整型的布尔(不支持),长整型的数字,长整型的字符串,短整型的布尔(不支持),短整型的数字,短整型的字符串,字符串的布尔,字符串的数字,字符串的字符串,字符串的错误,字符串的数字公式,字符串的字符串公式,字符串的数字日期
-1,1,1,TRUE,TRUE,TRUE,1,1,1,2020-01-01 01:01:01,2020-01-01 01:01:01,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,TRUE,1,测试,#VALUE!,2,1测试,2020-01-01 01:01:01
\ No newline at end of file
+大数的布尔(不支持),大数的数字,大数的字符串，大整数的布尔(不支持),大整数的数字,大整数的字符串,布尔的布尔,布尔的数字(不支持),布尔的字符串,字节的布尔(不支持),字节的数字,字节的字符串,日期的数字,日期的字符串,本地日期的数字,本地日期的字符串,双精度浮点的布尔(不支持),双精度浮点的数字,双精度浮点的字符串,浮点的布尔(不支持),浮点的数字,浮点的字符串,整型的布尔(不支持),整型的数字,整型的字符串,长整型的布尔(不支持),长整型的数字,长整型的字符串,短整型的布尔(不支持),短整型的数字,短整型的字符串,字符串的布尔,字符串的数字,字符串的字符串,字符串的错误,字符串的数字公式,字符串的字符串公式,字符串的数字日期
+1,1,1,1,1,1,TRUE,TRUE,TRUE,1,1,1,2020-01-01 01:01:01,2020-01-01 01:01:01,2020-01-01 01:01:01,2020-01-01 01:01:01,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,TRUE,1,测试,#VALUE!,2,1测试,2020-01-01 01:01:01
\ No newline at end of file