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 pageList(SysNotice sysNotice, Integer pageNo, Integer pageSize, HttpServletRequest req) { Page page = new Page<>(pageNo, pageSize); QueryWrapper 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); } }