From 636d0fb44c1792d6fa1479f264f50f7646321c45 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Sun, 7 Apr 2024 15:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E6=9D=BF=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/domain/DcBoardReleaseLog.java | 33 ++++++++++++++++---
 .../business/DcBoardReleaseLogMapper.xml      |  2 ++
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
index 00eed7d1..4cca0529 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
@@ -49,9 +49,9 @@ public class DcBoardReleaseLog extends BaseEntity
     @ApiModelProperty(value="发布内容")
     private String releaseContent;
 
-    /** 发布状态（0：成功；1：失败） */
-    @Excel(name = "发布状态", readConverterExp = "0=成功,1失败")
-    @ApiModelProperty(value="发布状态0=：成功；1：失败")
+    /** 发布状态（0：失败；1：成功） */
+    @Excel(name = "发布状态", readConverterExp = "0=失败,1成功")
+    @ApiModelProperty(value="发布状态0=：失败；1：成功")
     private String releaseStatus;
 
     /** 发布时间 */
@@ -60,6 +60,14 @@ public class DcBoardReleaseLog extends BaseEntity
     @Excel(name = "发布时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date releaseTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="范围查询-开始时间")
+    private Date startTime;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value="范围查询-结束时间")
+    private Date endTime;
+
     /** 发布机构 */
     @Excel(name = "发布机构")
     @ApiModelProperty(value="发布机构")
@@ -161,7 +169,24 @@ public class DcBoardReleaseLog extends BaseEntity
     {
         return releaseTime;
     }
-    public void setReleaseDeptName(String releaseDeptName) 
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public void setReleaseDeptName(String releaseDeptName)
     {
         this.releaseDeptName = releaseDeptName;
     }
diff --git a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
index 39f25722..8613d775 100644
--- a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
@@ -36,6 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="releaseContent != null  and releaseContent != ''"> and t1.release_content = #{releaseContent}</if>
             <if test="releaseStatus != null  and releaseStatus != ''"> and t1.release_status = #{releaseStatus}</if>
             <if test="releaseTime != null "> and t1.release_time = #{releaseTime}</if>
+            <if test="startTime != null"> and date_format(t1.release_time,'%Y-%m-%d %H:%i:%s') >= date_format(#{startTime},'%Y-%m-%d %H:%i:%s')</if>
+            <if test="endTime != null"> and date_format(t1.release_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')</if>
             <if test="releaseDeptName != null  and releaseDeptName != ''"> and t1.release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
             <if test="releaseDeptId != null  and releaseDeptId != ''"> and t1.release_dept_id = #{releaseDeptId}</if>
             <if test="releaseUserName != null  and releaseUserName != ''"> and t1.release_user_name like concat('%', #{releaseUserName}, '%')</if>