From 350c6b486ae9d150a010cd067e3d571e315846af Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 26 Sep 2024 13:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E5=BA=A6=E7=AE=A1=E7=90=86=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SzRegulatoryFrameworkController.java   |  4 ++--
 .../project/xyt/model/SzRegulatoryFramework.java      | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java b/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java
index 63a4ce8..795217a 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/SzRegulatoryFrameworkController.java
@@ -111,11 +111,11 @@ public class SzRegulatoryFrameworkController extends AbstractCommonFileControlle
         }
 
         if (Objects.nonNull(page.getStm())) {
-            query.ge(SzRegulatoryFramework::getCreateTime, page.getStm());
+            query.ge(SzRegulatoryFramework::getReleaseDate, page.getStm());
         }
 
         if (Objects.nonNull(page.getEtm())) {
-            query.le(SzRegulatoryFramework::getCreateTime, page.getEtm());
+            query.le(SzRegulatoryFramework::getReleaseDate, page.getEtm());
         }
 
         query.orderByDesc(SzRegulatoryFramework::getCreateTime);
diff --git a/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java b/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java
index 85c35f4..a0d40cc 100644
--- a/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java
+++ b/src/main/java/com/gunshi/project/xyt/model/SzRegulatoryFramework.java
@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gunshi.core.dateformat.DateFormatString;
 import com.gunshi.project.xyt.validate.markers.Insert;
 import com.gunshi.project.xyt.validate.markers.Update;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -16,6 +18,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -60,6 +63,14 @@ public class SzRegulatoryFramework extends CommUpdate implements Serializable {
     @Size(max = 50,message = "发布单位最大长度要小于 50")
     private String fillUnit;
 
+    /**
+     * 发布日期
+     */
+    @TableField(value="release_date")
+    @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+    @Schema(description="发布日期")
+    private Date releaseDate;
+
     /**
      * 制度类型
      */