From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 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 4068006..2b76634 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,12 @@
package com.ycl.platform.domain.query;
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 java.util.List;
/**
* 鎶ュ鏌ヨ
@@ -24,9 +21,28 @@
private String reportType;
- private Date beginCreateTime;
+ private String keyword;
- private Date endCreateTime;
+// private Date beginCreateTime;
+//
+// private Date endCreateTime;
+
+ private String pointId;
+
+ private String peopleId;
+
+ private List<Integer> pointIdList;
+
+ private List<Integer> peopleIdList;
+
+ @ApiModelProperty("杩愮淮鍗曚綅")
+ private Integer unitId;
+
+ @ApiModelProperty("鐘舵��")
+ private Integer status;
+
+ @ApiModelProperty("鏁呴殰绫诲瀷")
+ private List<String> errorTypeList;
}
--
Gitblit v1.8.0