From ac298f4b4f31fcef948203d94e135c1b967274cc Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Fri, 21 Jul 2023 09:22:47 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=85=AC=E5=91=8A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/modules/system/entity/SysNotice.java  | 12 ++++++++++++
 .../system/service/impl/SysNoticeServiceImpl.java  | 14 ++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java
index a63f3c5b..51234485 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysNotice.java
@@ -1,6 +1,7 @@
 package com.jero.modules.system.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
@@ -50,4 +51,15 @@ public class SysNotice implements Serializable {
     @ApiModelProperty("状态（1-启用，0-禁用）")
     @NotNull(message = "状态不能为空")
     private Integer noticeStatus;
+
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date startTime;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @TableField(exist = false)
+    private Date endTime;
 }
diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java
index 8456983a..28b0f25d 100644
--- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java
+++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysNoticeServiceImpl.java
@@ -11,7 +11,11 @@ import com.jero.modules.system.service.ISysNoticeService;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
 import java.util.Arrays;
+import java.util.Objects;
 
 /**
  * @Author: liao
@@ -44,6 +48,16 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
     public IPage<SysNotice> pageList(SysNotice sysNotice, Integer pageNo, Integer pageSize, HttpServletRequest req) {
         Page<SysNotice> page = new Page<>(pageNo, pageSize);
         QueryWrapper<SysNotice> queryWrapper = QueryGenerator.initQueryWrapper(sysNotice, req.getParameterMap());
+        if (!Objects.isNull(sysNotice.getStartTime())) {
+            queryWrapper.ge("create_time", sysNotice.getStartTime());
+        }
+        if (!Objects.isNull(sysNotice.getEndTime())) {
+            // 将Date类型转换为LocalDateTime类型
+            LocalDateTime endDateTime = sysNotice.getEndTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            // 获取当天最晚时间
+            LocalDateTime endOfDay = endDateTime.with(LocalTime.MAX);
+            queryWrapper.le("create_time", endOfDay);
+        }
         return page(page, queryWrapper);
     }
 }