From 8f2e8522daf081ad4da027c39a776fdd9483b97e Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 15 九月 2025 15:20:51 +0800 Subject: [PATCH] 新需求 --- ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 49 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 42 insertions(+), 7 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java index 4e63f3b..a825fc7 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java @@ -1,15 +1,15 @@ package com.ycl.platform.domain.query; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsQuery; - -import java.util.Date; -import java.util.List; -import org.springframework.lang.NonNull; -import jakarta.validation.constraints.NotBlank; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; +import java.util.List; /** * 鎶ュ鏌ヨ @@ -24,9 +24,11 @@ private String reportType; - private Date beginCreateTime; + private String keyword; - private Date endCreateTime; +// private Date beginCreateTime; +// +// private Date endCreateTime; private String pointId; @@ -36,5 +38,38 @@ private List<Integer> peopleIdList; + @ApiModelProperty("杩愮淮鍗曚綅") + private Integer unitId; + + @ApiModelProperty("鐘舵��") + private Integer status; + + @ApiModelProperty("鏁呴殰绫诲瀷") + private List<String> errorTypeList; + + /** + * 鎶ュ寮�濮嬫椂鏃� + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date reportTimeStart; + /** + * 鎶ュ缁撴潫鏃堕棿 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date reportTimeEnd; + /** + * 鏈夋晥寮�濮嬫椂闂� + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date effectTimeStart; + /** + * 鏈夋晥缁撴潫鏃堕棿 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date effectTimeEnd; } -- Gitblit v1.8.0