diff --git a/src/main/java/com/gaotao/common/utils/GenDate.java b/src/main/java/com/gaotao/common/utils/GenDate.java index a73da88..75898dc 100644 --- a/src/main/java/com/gaotao/common/utils/GenDate.java +++ b/src/main/java/com/gaotao/common/utils/GenDate.java @@ -1,6 +1,7 @@ package com.gaotao.common.utils; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; public class GenDate { @@ -10,4 +11,18 @@ public class GenDate { int excelDate = (int) days; return excelDate+siteCode; } + + /** + * 将LocalDate转换为指定格式的日期字符串 + * @param currentDate 要转换的日期 + * @param dateFormat 日期格式,例如:"yyyy-MM-dd", "yyyyMMdd", "yyyy/MM/dd" 等 + * @return 格式化后的日期字符串 + */ + public static String formatDate(LocalDate currentDate, String dateFormat) { + if (currentDate == null || dateFormat == null || dateFormat.trim().isEmpty()) { + return ""; + } + DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat); + return currentDate.format(formatter); + } } diff --git a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java index 2d41c28..b407643 100644 --- a/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java +++ b/src/main/java/com/gaotao/modules/label/service/impl/PrintLabelRecordServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gaotao.common.constant.SysMsgConstant; import com.gaotao.common.utils.GenDate; -import com.gaotao.modules.app.entity.UserEntity; import com.gaotao.modules.factory.entity.Site; import com.gaotao.modules.factory.service.SiteService; import com.gaotao.modules.label.entity.LabelFormatUserDefault; @@ -170,7 +169,9 @@ public class PrintLabelRecordServiceImpl extends ServiceImpl