From d911519d7d488d072d109ee4ce7191484a7dc32d Mon Sep 17 00:00:00 2001
From: SummerC0zyR0ck <adsdas08@163.com>
Date: Thu, 10 Sep 2026 07:31:29 +0000
Subject: [PATCH 1/5] feat: add java.sql.Time converter support

---
 .../converters/DefaultConverterLoader.java    |  7 ++
 .../sqltime/SqlTimeDateConverter.java         | 43 ++++++++++
 .../sqltime/SqlTimeNumberConverter.java       | 51 ++++++++++++
 .../sqltime/SqlTimeStringConverter.java       | 55 +++++++++++++
 .../sheet/converter/SqlTimeRoundTripData.java | 24 ++++++
 .../sheet/converter/SqlTimeRoundTripTest.java | 40 ++++++++++
 .../DefaultConverterLoaderTest.java           | 21 +++++
 .../sqltime/SqlTimeConverterTest.java         | 78 +++++++++++++++++++
 8 files changed, 319 insertions(+)
 create mode 100644 fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
 create mode 100644 fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
 create mode 100644 fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
 create mode 100644 fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
 create mode 100644 fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
 create mode 100644 fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java

diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java
index f17d9b62c..ac8522e62 100644
--- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/DefaultConverterLoader.java
@@ -73,6 +73,9 @@
 import org.apache.fesod.sheet.converters.shortconverter.ShortBooleanConverter;
 import org.apache.fesod.sheet.converters.shortconverter.ShortNumberConverter;
 import org.apache.fesod.sheet.converters.shortconverter.ShortStringConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeDateConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeNumberConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeStringConverter;
 import org.apache.fesod.sheet.converters.string.StringBooleanConverter;
 import org.apache.fesod.sheet.converters.string.StringErrorConverter;
 import org.apache.fesod.sheet.converters.string.StringNumberConverter;
@@ -122,6 +125,8 @@ private static void initAllConverter() {
 
         putAllConverter(new LocalTimeNumberConverter());
         putAllConverter(new LocalTimeStringConverter());
+        putAllConverter(new SqlTimeNumberConverter());
+        putAllConverter(new SqlTimeStringConverter());
 
         putAllConverter(new DoubleBooleanConverter());
         putAllConverter(new DoubleNumberConverter());
@@ -160,6 +165,7 @@ private static void initDefaultWriteConverter() {
         putWriteConverter(new LocalDateTimeDateConverter());
         putWriteConverter(new LocalDateDateConverter());
         putWriteConverter(new LocalTimeDateConverter());
+        putWriteConverter(new SqlTimeDateConverter());
         putWriteConverter(new DoubleNumberConverter());
         putWriteConverter(new FloatNumberConverter());
         putWriteConverter(new IntegerNumberConverter());
@@ -181,6 +187,7 @@ private static void initDefaultWriteConverter() {
         putWriteStringConverter(new LocalDateStringConverter());
         putWriteStringConverter(new LocalDateTimeStringConverter());
         putWriteStringConverter(new LocalTimeStringConverter());
+        putWriteStringConverter(new SqlTimeStringConverter());
         putWriteStringConverter(new DoubleStringConverter());
         putWriteStringConverter(new FloatStringConverter());
         putWriteStringConverter(new IntegerStringConverter());
diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
new file mode 100644
index 000000000..e5d7d0156
--- /dev/null
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converters.sqltime;
+
+import java.sql.Time;
+import java.time.LocalDateTime;
+import org.apache.fesod.sheet.converters.Converter;
+import org.apache.fesod.sheet.metadata.GlobalConfiguration;
+import org.apache.fesod.sheet.metadata.data.WriteCellData;
+import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
+import org.apache.fesod.sheet.util.DateUtils;
+import org.apache.fesod.sheet.util.WorkBookUtil;
+
+/** java.sql.Time and date converter. */
+public class SqlTimeDateConverter implements Converter<Time> {
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return Time.class;
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(
+            Time value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        LocalDateTime localDateTime = value == null ? null : value.toLocalTime().atDate(DateUtils.EPOCH);
+        WriteCellData<?> cellData = new WriteCellData<>(localDateTime);
+        String format = null;
+        if (contentProperty != null && contentProperty.getDateTimeFormatProperty() != null) {
+            format = contentProperty.getDateTimeFormatProperty().getFormat();
+        }
+        WorkBookUtil.fillDataFormat(
+                cellData, format == null || format.isEmpty() ? null : format, DateUtils.DEFAULT_LOCAL_TIME_FORMAT);
+        return cellData;
+    }
+}
diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
new file mode 100644
index 000000000..1e9d46c2b
--- /dev/null
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converters.sqltime;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import org.apache.fesod.sheet.converters.Converter;
+import org.apache.fesod.sheet.enums.CellDataTypeEnum;
+import org.apache.fesod.sheet.metadata.GlobalConfiguration;
+import org.apache.fesod.sheet.metadata.data.ReadCellData;
+import org.apache.fesod.sheet.metadata.data.WriteCellData;
+import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
+import org.apache.fesod.sheet.util.DateUtils;
+import org.apache.poi.ss.usermodel.DateUtil;
+
+/** java.sql.Time and number converter. */
+public class SqlTimeNumberConverter implements Converter<Time> {
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return Time.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.NUMBER;
+    }
+
+    @Override
+    public Time convertToJavaData(
+            ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        return Time.valueOf(DateUtils.getLocalTime(
+                cellData.getNumberValue().doubleValue(), DateUtils.isDate1904(contentProperty, globalConfiguration)));
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(
+            Time value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        return new WriteCellData<>(BigDecimal.valueOf(DateUtil.getExcelDate(
+                value.toLocalTime().atDate(DateUtils.EPOCH),
+                DateUtils.isDate1904(contentProperty, globalConfiguration))));
+    }
+}
diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
new file mode 100644
index 000000000..384a7bd1d
--- /dev/null
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converters.sqltime;
+
+import java.sql.Time;
+import java.time.LocalTime;
+import org.apache.fesod.sheet.converters.Converter;
+import org.apache.fesod.sheet.enums.CellDataTypeEnum;
+import org.apache.fesod.sheet.metadata.GlobalConfiguration;
+import org.apache.fesod.sheet.metadata.data.ReadCellData;
+import org.apache.fesod.sheet.metadata.data.WriteCellData;
+import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
+import org.apache.fesod.sheet.util.DateUtils;
+
+/** java.sql.Time and string converter. */
+public class SqlTimeStringConverter implements Converter<Time> {
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        return Time.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Time convertToJavaData(
+            ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        String format = contentProperty == null || contentProperty.getDateTimeFormatProperty() == null
+                ? null
+                : contentProperty.getDateTimeFormatProperty().getFormat();
+        LocalTime localTime =
+                DateUtils.parseLocalTime(cellData.getStringValue(), format, globalConfiguration.getLocale());
+        return Time.valueOf(localTime);
+    }
+
+    @Override
+    public WriteCellData<?> convertToExcelData(
+            Time value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        String format = contentProperty == null || contentProperty.getDateTimeFormatProperty() == null
+                ? null
+                : contentProperty.getDateTimeFormatProperty().getFormat();
+        return new WriteCellData<>(DateUtils.format(value.toLocalTime(), format, globalConfiguration.getLocale()));
+    }
+}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
new file mode 100644
index 000000000..c8f3a44d0
--- /dev/null
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converter;
+
+import java.sql.Time;
+import lombok.Getter;
+import lombok.Setter;
+import org.apache.fesod.sheet.annotation.ExcelProperty;
+
+@Getter
+@Setter
+public class SqlTimeRoundTripData {
+    @ExcelProperty("time")
+    private Time time;
+}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
new file mode 100644
index 000000000..927ea8e67
--- /dev/null
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converter;
+
+import java.io.File;
+import java.sql.Time;
+import java.util.Collections;
+import java.util.List;
+import org.apache.fesod.sheet.testkit.Tags;
+import org.apache.fesod.sheet.testkit.base.AbstractExcelTest;
+import org.apache.fesod.sheet.testkit.enums.ExcelFormat;
+import org.apache.fesod.sheet.testkit.helpers.RoundTripHelper;
+import org.apache.fesod.sheet.testkit.params.ExcelFormatSource;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.params.ParameterizedTest;
+
+@Tag(Tags.ROUND_TRIP)
+class SqlTimeRoundTripTest extends AbstractExcelTest {
+    @ParameterizedTest
+    @ExcelFormatSource
+    void roundTrip(ExcelFormat format) throws Exception {
+        File file = createTempFile(format);
+        SqlTimeRoundTripData input = new SqlTimeRoundTripData();
+        input.setTime(Time.valueOf("12:34:56"));
+        List<SqlTimeRoundTripData> result =
+                RoundTripHelper.writeAndRead(file, SqlTimeRoundTripData.class, Collections.singletonList(input));
+        Assertions.assertEquals(1, result.size());
+        Assertions.assertEquals(input.getTime(), result.get(0).getTime());
+    }
+}
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/DefaultConverterLoaderTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/DefaultConverterLoaderTest.java
index a30708a52..a9240a120 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/DefaultConverterLoaderTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/DefaultConverterLoaderTest.java
@@ -19,12 +19,16 @@
 
 package org.apache.fesod.sheet.converters;
 
+import java.sql.Time;
 import java.time.LocalTime;
 import java.util.Map;
 import org.apache.fesod.sheet.converters.ConverterKeyBuild.ConverterKey;
 import org.apache.fesod.sheet.converters.localtime.LocalTimeDateConverter;
 import org.apache.fesod.sheet.converters.localtime.LocalTimeNumberConverter;
 import org.apache.fesod.sheet.converters.localtime.LocalTimeStringConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeDateConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeNumberConverter;
+import org.apache.fesod.sheet.converters.sqltime.SqlTimeStringConverter;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -67,6 +71,23 @@ void loadConvertersRegistersLocalTimeFamily() {
                 writeConverter.get(ConverterKeyBuild.buildKey(LocalTime.class, CellDataTypeEnum.STRING)));
     }
 
+    @Test
+    void loadConvertersRegistersSqlTimeFamily() {
+        Map<ConverterKey, Converter<?>> allConverter = DefaultConverterLoader.loadAllConverter();
+        Assertions.assertInstanceOf(
+                SqlTimeNumberConverter.class,
+                allConverter.get(ConverterKeyBuild.buildKey(Time.class, CellDataTypeEnum.NUMBER)));
+        Assertions.assertInstanceOf(
+                SqlTimeStringConverter.class,
+                allConverter.get(ConverterKeyBuild.buildKey(Time.class, CellDataTypeEnum.STRING)));
+        Map<ConverterKey, Converter<?>> writeConverter = DefaultConverterLoader.loadDefaultWriteConverter();
+        Assertions.assertInstanceOf(
+                SqlTimeDateConverter.class, writeConverter.get(ConverterKeyBuild.buildKey(Time.class)));
+        Assertions.assertInstanceOf(
+                SqlTimeStringConverter.class,
+                writeConverter.get(ConverterKeyBuild.buildKey(Time.class, CellDataTypeEnum.STRING)));
+    }
+
     private static void assertLoadIsImmutableAndCopyIsMutable(
             Map<ConverterKey, Converter<?>> loaded, Map<ConverterKey, Converter<?>> copy) {
         Map.Entry<ConverterKey, Converter<?>> entry =
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
new file mode 100644
index 000000000..3f3a49d45
--- /dev/null
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.apache.fesod.sheet.converters.sqltime;
+
+import java.math.BigDecimal;
+import java.sql.Time;
+import java.time.LocalDate;
+import org.apache.fesod.sheet.converters.ConverterKeyBuild;
+import org.apache.fesod.sheet.converters.DefaultConverterLoader;
+import org.apache.fesod.sheet.enums.CellDataTypeEnum;
+import org.apache.fesod.sheet.metadata.GlobalConfiguration;
+import org.apache.fesod.sheet.metadata.data.ReadCellData;
+import org.apache.fesod.sheet.metadata.data.WriteCellData;
+import org.apache.fesod.sheet.metadata.property.DateTimeFormatProperty;
+import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class SqlTimeConverterTest {
+    private final GlobalConfiguration config = new GlobalConfiguration();
+
+    @Test
+    void registryContainsConverters() {
+        Assertions.assertTrue(DefaultConverterLoader.loadDefaultReadConverter()
+                .containsKey(ConverterKeyBuild.buildKey(Time.class, CellDataTypeEnum.NUMBER)));
+        Assertions.assertTrue(DefaultConverterLoader.loadDefaultReadConverter()
+                .containsKey(ConverterKeyBuild.buildKey(Time.class, CellDataTypeEnum.STRING)));
+        Assertions.assertTrue(
+                DefaultConverterLoader.loadDefaultWriteConverter().containsKey(ConverterKeyBuild.buildKey(Time.class)));
+    }
+
+    @Test
+    void dateNumberAndStringConversions() throws Exception {
+        Time time = Time.valueOf("12:34:56");
+        WriteCellData<?> date = new SqlTimeDateConverter().convertToExcelData(time, null, config);
+        Assertions.assertEquals(
+                time.toLocalTime().atDate(org.apache.fesod.sheet.util.DateUtils.EPOCH), date.getDateValue());
+        SqlTimeNumberConverter number = new SqlTimeNumberConverter();
+        WriteCellData<?> numeric = number.convertToExcelData(time, null, config);
+        Assertions.assertEquals(
+                time, number.convertToJavaData(new ReadCellData<>(numeric.getNumberValue()), null, config));
+        SqlTimeStringConverter string = new SqlTimeStringConverter();
+        WriteCellData<?> text = string.convertToExcelData(time, null, config);
+        Assertions.assertEquals(
+                time, string.convertToJavaData(new ReadCellData<>(text.getStringValue()), null, config));
+        Assertions.assertEquals(
+                time,
+                number.convertToJavaData(
+                        new ReadCellData<>(BigDecimal.valueOf(
+                                DateUtil.getExcelDate(LocalDate.of(2020, 1, 1).atTime(time.toLocalTime()), false))),
+                        null,
+                        config));
+    }
+
+    @Test
+    void supportsCustomFormatAnd1904Windowing() {
+        ExcelContentProperty property = new ExcelContentProperty();
+        property.setDateTimeFormatProperty(new DateTimeFormatProperty("HH:mm", Boolean.TRUE));
+        Time time = Time.valueOf("12:30:00");
+        WriteCellData<?> text = new SqlTimeStringConverter().convertToExcelData(time, property, config);
+        Assertions.assertEquals("12:30", text.getStringValue());
+        WriteCellData<?> numeric = new SqlTimeNumberConverter().convertToExcelData(time, property, config);
+        Assertions.assertEquals(
+                DateUtil.getExcelDate(time.toLocalTime().atDate(org.apache.fesod.sheet.util.DateUtils.EPOCH), true),
+                numeric.getNumberValue().doubleValue(),
+                1e-8);
+    }
+}

From a09952df5da31ad4bf9df130ecacbd4234e8d0d6 Mon Sep 17 00:00:00 2001
From: SummerC0zyR0ck <adsdas08@163.com>
Date: Fri, 11 Sep 2026 00:58:10 +0000
Subject: [PATCH 2/5] style: add missing license headers

---
 .../converters/sqltime/SqlTimeDateConverter.java | 16 ++++++++++++----
 .../sqltime/SqlTimeNumberConverter.java          | 16 ++++++++++++----
 .../sqltime/SqlTimeStringConverter.java          | 16 ++++++++++++----
 .../sheet/converter/SqlTimeRoundTripData.java    | 16 ++++++++++++----
 .../sheet/converter/SqlTimeRoundTripTest.java    | 16 ++++++++++++----
 .../converters/sqltime/SqlTimeConverterTest.java | 15 +++++++++++----
 6 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
index e5d7d0156..465608e5b 100644
--- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeDateConverter.java
@@ -1,14 +1,22 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.fesod.sheet.converters.sqltime;
 
 import java.sql.Time;
diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
index 1e9d46c2b..3dc548f64 100644
--- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
@@ -1,14 +1,22 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.fesod.sheet.converters.sqltime;
 
 import java.math.BigDecimal;
diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
index 384a7bd1d..717e33ee5 100644
--- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeStringConverter.java
@@ -1,14 +1,22 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.fesod.sheet.converters.sqltime;
 
 import java.sql.Time;
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
index c8f3a44d0..a2450a7d7 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripData.java
@@ -1,14 +1,22 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.fesod.sheet.converter;
 
 import java.sql.Time;
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
index 927ea8e67..27a2cfb1f 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converter/SqlTimeRoundTripTest.java
@@ -1,14 +1,22 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.fesod.sheet.converter;
 
 import java.io.File;
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
index 3f3a49d45..19c7215ae 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
@@ -1,13 +1,20 @@
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
+ * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
+ * regarding copyright ownership.  The ASF licenses this file
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * with the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 package org.apache.fesod.sheet.converters.sqltime;
 

From 5dee8dcdc8cdcf281fc3fc78fbe3a6ee94e92483 Mon Sep 17 00:00:00 2001
From: SummerC0zyR0ck <adsdas08@163.com>
Date: Fri, 11 Sep 2026 08:53:26 +0000
Subject: [PATCH 3/5] style: fix license header format in SqlTimeConverterTest

---
 .../fesod/sheet/converters/sqltime/SqlTimeConverterTest.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
index 19c7215ae..e0eb3612c 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
 package org.apache.fesod.sheet.converters.sqltime;
 
 import java.math.BigDecimal;

From 9aacd4fe69ee756f0bce88ef0ef3340d3886d0c0 Mon Sep 17 00:00:00 2001
From: SummerC0zyR0ck <adsdas08@163.com>
Date: Tue, 15 Sep 2026 01:17:45 +0000
Subject: [PATCH 4/5] test: verify locale-specific SQL time formatting

---
 .../sqltime/SqlTimeConverterTest.java         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
index e0eb3612c..3675fbe77 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
@@ -22,6 +22,7 @@
 import java.math.BigDecimal;
 import java.sql.Time;
 import java.time.LocalDate;
+import java.util.Locale;
 import org.apache.fesod.sheet.converters.ConverterKeyBuild;
 import org.apache.fesod.sheet.converters.DefaultConverterLoader;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
@@ -83,4 +84,23 @@ void supportsCustomFormatAnd1904Windowing() {
                 numeric.getNumberValue().doubleValue(),
                 1e-8);
     }
+
+    @Test
+    void stringConverterUsesLocaleSensitiveAmPmMarker() {
+        ExcelContentProperty property = new ExcelContentProperty();
+        property.setDateTimeFormatProperty(new DateTimeFormatProperty("HH:mm:ss a", Boolean.FALSE));
+        Time time = Time.valueOf("12:30:45");
+        SqlTimeStringConverter converter = new SqlTimeStringConverter();
+
+        GlobalConfiguration us = new GlobalConfiguration();
+        us.setLocale(Locale.US);
+        GlobalConfiguration china = new GlobalConfiguration();
+        china.setLocale(Locale.CHINA);
+
+        WriteCellData<?> usWritten = converter.convertToExcelData(time, property, us);
+        WriteCellData<?> chinaWritten = converter.convertToExcelData(time, property, china);
+
+        Assertions.assertEquals("12:30:45 PM", usWritten.getStringValue());
+        Assertions.assertEquals("12:30:45 下午", chinaWritten.getStringValue());
+    }
 }

From 02064d8e9475e6657a1abf454cb818f71f9222d8 Mon Sep 17 00:00:00 2001
From: SummerC0zyR0ck <adsdas08@163.com>
Date: Wed, 16 Sep 2026 08:29:42 +0000
Subject: [PATCH 5/5] fix: handle invalid Excel serial in
 SqlTimeNumberConverter

---
 .../sheet/converters/sqltime/SqlTimeNumberConverter.java | 6 ++++--
 .../sheet/converters/sqltime/SqlTimeConverterTest.java   | 9 +++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
index 3dc548f64..1b78de518 100644
--- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
+++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeNumberConverter.java
@@ -21,6 +21,7 @@
 
 import java.math.BigDecimal;
 import java.sql.Time;
+import java.time.LocalTime;
 import org.apache.fesod.sheet.converters.Converter;
 import org.apache.fesod.sheet.enums.CellDataTypeEnum;
 import org.apache.fesod.sheet.metadata.GlobalConfiguration;
@@ -45,8 +46,9 @@ public CellDataTypeEnum supportExcelTypeKey() {
     @Override
     public Time convertToJavaData(
             ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
-        return Time.valueOf(DateUtils.getLocalTime(
-                cellData.getNumberValue().doubleValue(), DateUtils.isDate1904(contentProperty, globalConfiguration)));
+        LocalTime localTime = DateUtils.getLocalTime(
+                cellData.getNumberValue().doubleValue(), DateUtils.isDate1904(contentProperty, globalConfiguration));
+        return localTime == null ? null : Time.valueOf(localTime);
     }
 
     @Override
diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
index 3675fbe77..2bf71e560 100644
--- a/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
+++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/converters/sqltime/SqlTimeConverterTest.java
@@ -31,10 +31,13 @@
 import org.apache.fesod.sheet.metadata.data.WriteCellData;
 import org.apache.fesod.sheet.metadata.property.DateTimeFormatProperty;
 import org.apache.fesod.sheet.metadata.property.ExcelContentProperty;
+import org.apache.fesod.sheet.testkit.Tags;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
+@Tag(Tags.UNIT)
 class SqlTimeConverterTest {
     private final GlobalConfiguration config = new GlobalConfiguration();
 
@@ -71,6 +74,12 @@ void dateNumberAndStringConversions() throws Exception {
                         config));
     }
 
+    @Test
+    void invalidNumberReturnsNull() {
+        Assertions.assertNull(new SqlTimeNumberConverter()
+                .convertToJavaData(new ReadCellData<>(BigDecimal.valueOf(-1)), null, config));
+    }
+
     @Test
     void supportsCustomFormatAnd1904Windowing() {
         ExcelContentProperty property = new ExcelContentProperty();