From 9f8b3700ffbcc616a97e7ee2ea283ef4df3d666a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 04 六月 2026 08:43:55 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java b/server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java
index 9220f7d..0c7d156 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java
@@ -14,21 +14,43 @@
@ApiModel("鏁版嵁鐪嬫澘鏌ヨ鏉′欢")
public class DataBoardQueryDTO implements Serializable {
- @ApiModelProperty(value = "鏃ユ湡娈电被鍨嬶細0=浠婃棩锛�1=杩戜竷澶╋紝2=杩�30澶╋紝3=杩戝崐骞达紝4=杩戜竴骞�", required = true)
+ @ApiModelProperty(value = "鏃ユ湡娈电被鍨嬶細0=浠婃棩锛�1=杩戜竷澶╋紝2=杩�30澶╋紝3=杩戝崐骞达紝4=杩戜竴骞达紝5=鑷畾涔�", required = true)
private Integer dateType;
- @JsonIgnore
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鑷畾涔夊紑濮嬫棩鏈燂紙dateType=5鏃跺繀浼狅級")
private Date startDate;
- @JsonIgnore
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鑷畾涔夌粨鏉熸棩鏈燂紙dateType=5鏃跺繀浼狅級")
private Date endDate;
@ApiModelProperty(value = "闂ㄥ簵涓婚敭锛堝彲閫夛級")
private Integer shopId;
public void resolveDateRange() {
+ if (dateType != null && dateType == 5) {
+ if (startDate != null) {
+ Calendar start = Calendar.getInstance();
+ start.setTime(startDate);
+ start.set(Calendar.HOUR_OF_DAY, 0);
+ start.set(Calendar.MINUTE, 0);
+ start.set(Calendar.SECOND, 0);
+ start.set(Calendar.MILLISECOND, 0);
+ this.startDate = start.getTime();
+ }
+ if (endDate != null) {
+ Calendar end = Calendar.getInstance();
+ end.setTime(endDate);
+ end.set(Calendar.HOUR_OF_DAY, 23);
+ end.set(Calendar.MINUTE, 59);
+ end.set(Calendar.SECOND, 59);
+ end.set(Calendar.MILLISECOND, 999);
+ this.endDate = end.getTime();
+ }
+ return;
+ }
+
Calendar now = Calendar.getInstance();
now.set(Calendar.MINUTE, 0);
now.set(Calendar.SECOND, 0);
--
Gitblit v1.9.3