From ee327d5f52ccdb0765fe5e5a4d5e2c314ba5260f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 04 十一月 2025 11:40:24 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java
index fdf2318..b6f746a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysNoticeServiceImpl.java
@@ -11,8 +11,10 @@
import com.ruoyi.system.query.TSysNoticeQuery;
import com.ruoyi.system.service.TSysNoticeService;
import com.ruoyi.system.vo.TSysNoticeVO;
+import io.jsonwebtoken.lang.Collections;
import org.springframework.stereotype.Service;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -41,6 +43,20 @@
public PageInfo<TSysNoticeVO> pageList(TSysNoticeQuery query) {
PageInfo<TSysNoticeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TSysNoticeVO> list = this.baseMapper.pageList(query,pageInfo);
+ if(Collections.isEmpty(list)){
+ return pageInfo;
+ }
+ for (TSysNoticeVO tSysNoticeVO : list) {
+ if(tSysNoticeVO.getStartTime().isAfter(LocalDateTime.now())){
+ tSysNoticeVO.setShowStatus(1);
+ }
+ if(tSysNoticeVO.getStartTime().isBefore(LocalDateTime.now()) && tSysNoticeVO.getEndTime().isAfter(LocalDateTime.now())){
+ tSysNoticeVO.setShowStatus(2);
+ }
+ if(tSysNoticeVO.getEndTime().isBefore(LocalDateTime.now())){
+ tSysNoticeVO.setShowStatus(3);
+ }
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1