From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/dao/dto/DataBoardQueryDTO.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 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 b1e5a3e..9220f7d 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
@@ -1,25 +1,70 @@
package com.doumee.dao.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
+import java.util.Calendar;
import java.util.Date;
@Data
@ApiModel("鏁版嵁鐪嬫澘鏌ヨ鏉′欢")
public class DataBoardQueryDTO implements Serializable {
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @ApiModelProperty(value = "鏃ユ湡娈电被鍨嬶細0=浠婃棩锛�1=杩戜竷澶╋紝2=杩�30澶╋紝3=杩戝崐骞达紝4=杩戜竴骞�", required = true)
+ private Integer dateType;
+
+ @JsonIgnore
@JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @JsonIgnore
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "闂ㄥ簵涓婚敭锛堝彲閫夛級")
private Integer shopId;
+
+ public void resolveDateRange() {
+ Calendar now = Calendar.getInstance();
+ now.set(Calendar.MINUTE, 0);
+ now.set(Calendar.SECOND, 0);
+ now.set(Calendar.MILLISECOND, 0);
+ now.set(Calendar.HOUR_OF_DAY, 0);
+
+ Calendar start = Calendar.getInstance();
+ start.set(Calendar.MINUTE, 0);
+ start.set(Calendar.SECOND, 0);
+ start.set(Calendar.MILLISECOND, 0);
+ start.set(Calendar.HOUR_OF_DAY, 0);
+
+ switch (dateType != null ? dateType : 0) {
+ case 1:
+ start.add(Calendar.DAY_OF_MONTH, -6);
+ break;
+ case 2:
+ start.add(Calendar.DAY_OF_MONTH, -29);
+ break;
+ case 3:
+ start.add(Calendar.MONTH, -6);
+ break;
+ case 4:
+ start.add(Calendar.YEAR, -1);
+ break;
+ default:
+ // 0=浠婃棩锛宻tart 宸茬粡鏄粖澶�
+ break;
+ }
+ this.startDate = start.getTime();
+
+ Calendar end = Calendar.getInstance();
+ 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();
+ }
}
--
Gitblit v1.9.3