Skip to content

Commit 2e606a5

Browse files
fix: render negative date serials as numbers (#1117)
* test: cover DataFormatter formatting paths * fix: render negative date serials as numbers --------- Co-authored-by: Bengbengbalabalabeng <[email protected]>
1 parent afc959b commit 2e606a5

2 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎fesod-sheet/src/main/java/org/apache/fesod/sheet/metadata/format/DataFormatter.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,11 @@ private String getFormattedNumberString(BigDecimal data, Short dataFormat, Strin
681681
*/
682682
public String format(BigDecimal data, Short dataFormat, String dataFormatString) {
683683
if (DateUtils.isADateFormat(dataFormat, dataFormatString)) {
684-
return getFormattedDateString(data.doubleValue(), dataFormat, dataFormatString);
684+
if (DateUtils.isValidExcelDate(data.doubleValue())) {
685+
return getFormattedDateString(data.doubleValue(), dataFormat, dataFormatString);
686+
}
687+
688+
return getDefaultFormat().format(data);
685689
}
686690
return getFormattedNumberString(data, dataFormat, dataFormatString);
687691
}

‎fesod-sheet/src/test/java/org/apache/fesod/sheet/metadata/format/DataFormatterTest.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,18 @@ void unescapesQuotedLiteralsInDatePatterns(String data, short dataFormat, String
249249
Assertions.assertEquals(expected, format(data, dataFormat, pattern));
250250
}
251251

252+
@ParameterizedTest(name = DATE_PATTERN_AND_RESULT)
253+
@CsvSource(
254+
delimiter = '|',
255+
value = {
256+
" -1 | 14 | yyyy-mm-dd | -1",
257+
"-123456.789012345 | 14 | yyyy-mm-dd | -123456.789",
258+
" -1 | 14 | [>=1]yyyy-mm-dd;\"negative\" | -1",
259+
})
260+
void fallsBackToGeneralForNegativeDateSerials(String data, short dataFormat, String pattern, String expected) {
261+
Assertions.assertEquals(expected, format(data, dataFormat, pattern));
262+
}
263+
252264
@ParameterizedTest(name = "[{index}] {0} -> {1}")
253265
@CsvSource(
254266
delimiter = '|',

0 commit comments

Comments
 (0)