From bd897b186f4dd82beb5a9f9f7f41555dcd77bf7e Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 07 一月 2026 14:35:46 +0800
Subject: [PATCH] 设备报修增添审批人id，维修价格字段，重整状态对应值。优化添加设备报修接口，同步数据到协同办公-报销管理。协同办公-报销管理的审核接口同步设备管理-设备报修状态。设备报修删除接口根据报销管理审核状态判断是否删除。
---
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("姝ｅ父");
+ }
+ });
+ return noticeDTOIPage;
}
@Override
--
Gitblit v1.9.3