From 6a074bb08783744bcc2de2220ecef4ab56c5fa2b Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期四, 25 一月 2024 10:58:58 +0800
Subject: [PATCH] 更新配瓦规则设置新增查询功能实现

---
 jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 7077b10..bdbf8dd 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -65,8 +65,7 @@
     private String paramStandard;
 
     /** 閲囬泦鏃堕棿 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "閲囬泦鏃堕棿")
     private Date collectionTime;
 
     /** 棰勭暀瀛楁1 */
@@ -97,6 +96,33 @@
     @Excel(name = "绫诲瀷")
     private String type;
 
+    private String[] dateConditions;
+
+    private String startTime;
+
+    private String endTime;
+
+    public String[] getDateConditions() {
+        return dateConditions;
+    }
+
+    public void setDateConditions(String[] dateConditions) {
+        this.dateConditions = dateConditions;
+    }
+
+    public String getStartTime() {return startTime;}
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
     public void setId(Long id) 
     {
         this.id = id;

--
Gitblit v1.9.3