From 08d63993247f4203f9c793edcab9d95190692e24 Mon Sep 17 00:00:00 2001 From: van Date: Thu, 8 Oct 2026 00:31:11 +0800 Subject: [PATCH] 1 --- .../jarvis/service/impl/RebateSheetConvertService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/RebateSheetConvertService.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/RebateSheetConvertService.java index 5aeb966..75a1fab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/RebateSheetConvertService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/RebateSheetConvertService.java @@ -26,10 +26,14 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -262,7 +266,7 @@ public class RebateSheetConvertService { continue; } SourceRow src = new SourceRow(); - src.dateText = cellText(row, header.dateCol); + src.dateText = dateCellText(row, header.dateCol); src.orderNo = normalizeOrderNo(cellText(row, header.orderCol)); src.model = cellText(row, header.modelCol); String rebateText = firstNonEmpty(cellText(row, header.totalRebateCol), cellText(row, header.rebateCol));