From 3bd356cdf09bc2e67dfe0ce9e6dc1b4dfe0e1bec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 13:16:14 +0800
Subject: [PATCH] feat(production): 新增入库添加产品规格型号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