From d3ee63dc365fbcb964a469150c9a84717f171eda Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 13:44:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 7 ++++++-
src/main/java/com/ruoyi/home/service/HomeService.java | 2 ++
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 13 +++++++++++++
3 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 5af8bb8..546f344 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -85,5 +85,10 @@
return AjaxResult.success(map);
}
-
+ @GetMapping("/noticesCount")
+ @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ public AjaxResult noticesCount(){
+ Long count = homeService.noticesCount();
+ return AjaxResult.success(count);
+ }
}
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 266a8ce..42a6f27 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -29,4 +29,6 @@
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
Map<String, Object> approveAndDeviceTodos();
+
+ Long noticesCount();
}
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 276cfb4..cbe815a 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
+import com.ruoyi.collaborativeApproval.mapper.NoticeMapper;
+import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.mapper.DeviceMaintenanceMapper;
import com.ruoyi.device.mapper.DeviceRepairMapper;
@@ -93,6 +95,9 @@
@Autowired
private SysDeptMapper sysDeptMapper;
+
+ @Autowired
+ private NoticeMapper noticeMapper;
@Override
public HomeBusinessDto business() {
@@ -467,4 +472,12 @@
put("deviceRepairTodo", aLong1);
}};
}
+
+ @Override
+ public Long noticesCount() {
+ // 鏌ヨ鏈繃鏈熺殑閫氱煡鏁伴噺锛氱姸鎬佷负鍙戝竷涓旇繃鏈熸椂闂村ぇ浜庣瓑浜庡綋鍓嶆棩鏈�
+ return noticeMapper.selectCount(new LambdaQueryWrapper<Notice>()
+ .eq(Notice::getStatus, 1) // 1琛ㄧず鍙戝竷鐘舵��
+ .ge(Notice::getExpirationDate, new Date())); // 杩囨湡鏃堕棿澶т簬绛変簬褰撳墠鏃ユ湡
+ }
}
--
Gitblit v1.9.3