Mikkey-f commented on code in PR #1020: URL: https://github.com/apache/fesod/pull/1020#discussion_r3863020195
########## fesod-sheet/src/main/java/org/apache/fesod/sheet/converters/zoneddatetime/ZonedDateTimeDateConverter.java: ########## @@ -0,0 +1,57 @@ +/* + * 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 + * + * 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. + */ + +/* + * This file is part of the Apache Fesod (Incubating) project, which was derived from Alibaba EasyExcel. + * + * Copyright (C) 2018-2024 Alibaba Group Holding Ltd. + */ + +package org.apache.fesod.sheet.converters.zoneddatetime; + +import java.time.LocalDateTime; +import java.time.ZonedDateTime; +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; + +/** ZonedDateTime and date converter. */ +public class ZonedDateTimeDateConverter implements Converter<ZonedDateTime> { + @Override + public Class<?> supportJavaTypeKey() { + return ZonedDateTime.class; + } + + @Override + public WriteCellData<?> convertToExcelData( + ZonedDateTime value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) + throws Exception { + LocalDateTime localDateTime = value.toLocalDateTime(); + WriteCellData<?> cellData = new WriteCellData<>(localDateTime); + String format = null; + if (contentProperty != null && contentProperty.getDateTimeFormatProperty() != null) { + format = contentProperty.getDateTimeFormatProperty().getFormat(); Review Comment: Empty `@DateTimeFormat` values are passed through to `WorkBookUtil.fillDataFormat` as-is. `fillDataFormat` only substitutes the default format when the argument is `null` — an empty string (`""`) is written into the cell style as-is, so `@DateTimeFormat(value = "")` produces a DATE cell with **no format at all** instead of falling back to `yyyy-MM-dd HH:mm:ss`. Suggest normalizing the empty format to `null` before the call: ```java String format = null; if (contentProperty != null && contentProperty.getDateTimeFormatProperty() != null) { format = contentProperty.getDateTimeFormatProperty().getFormat(); if (StringUtils.isEmpty(format)) { format = null; } } WorkBookUtil.fillDataFormat(cellData, format, DateUtils.defaultDateFormat); ``` This also keeps the DATE direction consistent with the string converter below, which already falls back when the format is empty. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
