From 377900a395f0238c98c5fbc945c2bea302b964f1 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 17 十二月 2025 17:28:39 +0800
Subject: [PATCH] 新增设备维修保养过程描述,上传对应附件

---
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
index 8f2216b..d6504a1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -24,7 +24,18 @@
 
     @Override
     public IPage<NoticeDTO> listPage(Page page, NoticeDTO noticeDTO) {
-        return noticeMapper.listPage(page, noticeDTO);
+        IPage<NoticeDTO> noticeDTOIPage = noticeMapper.listPage(page, noticeDTO);
+        noticeDTOIPage.getRecords().forEach(item -> {
+            // 鏍规嵁杩囨湡鏃堕棿鍒ゆ柇statusName
+            if (item.getExpirationDate() == null) {
+                item.setStatusName("鏈煡");
+            }else if(item.getExpirationDate().getTime() < System.currentTimeMillis()){
+                item.setStatusName("宸茶繃鏈�");
+            } else{
+                item.setStatusName("姝e父");
+            }
+        });
+        return noticeDTOIPage;
     }
 
     @Override

--
Gitblit v1.9.3