From 5c955d69de53d1cc67f1e6e50053035e1eeafee7 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 16 Sep 2025 17:47:04 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E5=BB=B6=E6=9C=9F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E9=99=90=E5=88=B6=E6=97=B6?= =?UTF-8?q?=E9=95=BF/=E5=8D=95=E4=BD=8D=E5=BF=85=E5=A1=AB=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E8=BD=AF=E4=BB=B6=E8=B4=AD=E4=B9=B0=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=A7=E5=93=81=E6=9C=89=E6=95=88=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/funds/delay/vo/ProductDelaySaveReqVO.java | 2 ++ .../admin/funds/purchase/vo/PurchaseRecordRespVO.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java index 7fce30ab6..8740062a6 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/delay/vo/ProductDelaySaveReqVO.java @@ -22,9 +22,11 @@ public class ProductDelaySaveReqVO { private Long purchaseId; @Schema(description = "延期时长", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotNull(message = "延期时长不能为空") private Integer delayDuration; @Schema(description = "延期时长单位,0:年、1:月、2:日", example = "1") + @NotNull(message = "延期时长单位不能为空") @DurationUnitValid private Integer delayDurationUnit; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java index 175f8f91a..c71991b07 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/funds/purchase/vo/PurchaseRecordRespVO.java @@ -9,6 +9,7 @@ import com.cf.imes.framework.excel.core.convert.EnumConvert; import com.cf.imes.module.system.enums.DictTypeConstants; import com.cf.imes.module.system.enums.pay.InvoiceStatusEnum; import com.cf.imes.module.system.enums.pay.ProductDurationUnitEnum; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -16,6 +17,8 @@ import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; +import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY; + @Data public class PurchaseRecordRespVO { @@ -105,6 +108,7 @@ public class PurchaseRecordRespVO { @Schema(description = "失效时间") @ExcelProperty("失效时间") + @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY) private LocalDate endTime; @Schema(description = "操作人")