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 | 16 +++++++++++++++-
1 files changed, 15 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 137b4b8..546f344 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -21,7 +21,9 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import java.text.ParseException;
import java.util.List;
+import java.util.Map;
/**
* @author :yys
@@ -63,7 +65,7 @@
@GetMapping("/todos")
@Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
@ApiOperation("寰呭姙浜嬮」")
- public AjaxResult todos(ApproveProcess req) {
+ public AjaxResult todos(ApproveProcess req) throws ParseException {
List<ApproveProcess> approveProcessList = homeService.todos();
return AjaxResult.success(approveProcessList);
}
@@ -76,5 +78,17 @@
return AjaxResult.success(statisticsReceivablePayable);
}
+ @GetMapping("/approveAndDeviceTodos")
+ @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
+ public AjaxResult approveAndDeviceTodos(){
+ Map<String, Object> map = homeService.approveAndDeviceTodos();
+ return AjaxResult.success(map);
+ }
+ @GetMapping("/noticesCount")
+ @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ public AjaxResult noticesCount(){
+ Long count = homeService.noticesCount();
+ return AjaxResult.success(count);
+ }
}
--
Gitblit v1.9.3