From 5997dc8acfa81a6c867c28810d1c3c9714efc46c Mon Sep 17 00:00:00 2001 From: cloudroam <cloudroam> Date: 星期六, 29 三月 2025 14:55:42 +0800 Subject: [PATCH] fix: 登录 --- src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java | 26 ++++++++++++++++++++------ 1 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java index da07577..64ed2ad 100644 --- a/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java +++ b/src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java @@ -5,21 +5,35 @@ import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; import java.time.LocalDate; +import java.time.LocalDateTime; @Data public class QueryOrderDTO { @ApiModelProperty(value = "开始时间") - @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") - @DateTimeFormat - private LocalDate startDate; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @NotNull(message = "开始时间不能为空") + private LocalDateTime startDate; @ApiModelProperty(value = "结束时间") - @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") - @DateTimeFormat - private LocalDate endDate; + @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss" ,timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @NotNull(message = "结束时间不能为空") + private LocalDateTime endDate; @ApiModelProperty(value = "合伙人id") private Long partnerId; + + @ApiModelProperty(value = "下单日期") + @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8") + @DateTimeFormat(pattern="yyyy-MM-dd") +// @NotNull(message = "下单日期不能为空") + private LocalDate calDate; + + @ApiModelProperty(value = "是否是合伙人,默认0") + private Integer partnerFlag; + } -- Gitblit v1.9.3