From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/dto/request/report/QueryOrderDTO.java | 23 +++++++++++++++++------
1 files changed, 17 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..a6fb34e 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,32 @@
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;
+
}
--
Gitblit v1.9.3