From 113cd73922b9b67c261c19c744e46eb2822d7b41 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:54:11 +0800
Subject: [PATCH] Merge branch 'prod' into dev_tide

---
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 56 insertions(+), 0 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
new file mode 100644
index 0000000..d6504a1
--- /dev/null
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -0,0 +1,56 @@
+package com.ruoyi.collaborativeApproval.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.collaborativeApproval.dto.NoticeDTO;
+import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
+import com.ruoyi.collaborativeApproval.pojo.Notice;
+import com.ruoyi.collaborativeApproval.service.NoticeService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+@Slf4j
+@AllArgsConstructor
+public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements NoticeService {
+
+    private final NoticeMapper noticeMapper;
+
+    @Override
+    public IPage<NoticeDTO> listPage(Page page, NoticeDTO 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
+    public List<NoticeDTO> selectCount() {
+        List<NoticeDTO> result = new ArrayList<>();
+        NoticeDTO notice = new NoticeDTO();
+        notice.setType(1);
+        notice.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, 1)));
+        result.add(notice);
+
+        NoticeDTO notice1 = new NoticeDTO();
+        notice1.setType(2);
+        notice1.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, 2)));
+        result.add(notice1);
+
+        return result;
+    }
+}

--
Gitblit v1.9.3