From 1f4fd31eaed8f70a4a03f2493abe17eea774c15b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 17:19:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/java/com/ycl/platform/controller/DashboardController.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DashboardController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DashboardController.java
index fa4ec5a..c81bf9c 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DashboardController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DashboardController.java
@@ -31,9 +31,14 @@
         return AjaxResult.success(deptService.dashboard());
     }
 
-    @GetMapping("/workOrder")
-    public AjaxResult workOrder(DashboardQuery dashboardQuery) {
-        return AjaxResult.success(workOrderService.dashboard(dashboardQuery));
+    @GetMapping("/workOrder/total")
+    public AjaxResult workOrderTotal(DashboardQuery dashboardQuery) {
+        return AjaxResult.success(workOrderService.workOrderTotal(dashboardQuery));
+    }
+
+    @GetMapping("/workOrder/region")
+    public AjaxResult workOrderRegion(DashboardQuery dashboardQuery) {
+        return AjaxResult.success(workOrderService.workOrderRegion(dashboardQuery));
     }
 
     @GetMapping("/monitor/total")

--
Gitblit v1.8.0