From a0914318549b357ef3c438d0c2a3714f58ea3487 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 23 一月 2026 14:14:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New

---
 src/main/java/com/ruoyi/home/controller/HomeController.java |   81 +++++++++++++++++++++++++++++-----------
 1 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 546f344..edda887 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -7,11 +7,10 @@
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.home.dto.AnalysisCustomerContractAmountsDto;
-import com.ruoyi.home.dto.HomeBusinessDto;
-import com.ruoyi.home.dto.QualityStatisticsDto;
-import com.ruoyi.home.dto.StatisticsReceivablePayableDto;
+import com.ruoyi.home.dto.*;
 import com.ruoyi.home.service.HomeService;
+import com.ruoyi.production.dto.ProductOrderDto;
+import com.ruoyi.production.dto.ProductWorkOrderDto;
 import com.ruoyi.production.dto.SalesLedgerWorkDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +36,31 @@
     @Autowired
     private HomeService homeService;
 
+    /********************************************************鍩虹绫�*****************************************************/
+    @GetMapping("/todos")
+    @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
+    @ApiOperation("寰呭姙浜嬮」")
+    public AjaxResult todos(ApproveProcess req) throws ParseException {
+        List<ApproveProcess> approveProcessList = homeService.todos();
+        return AjaxResult.success(approveProcessList);
+    }
+
+    @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);
+    }
+
+
+    /********************************************************钀ラ攢閲囪喘绫�**************************************************/
     @GetMapping("/business")
     @Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
     @ApiOperation("閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
@@ -54,6 +78,23 @@
         return AjaxResult.success(analysisCustomerContractAmounts);
     }
 
+
+    /********************************************************鐢熶骇绫�*****************************************************/
+    @GetMapping("/progressStatistics")
+    @ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
+    public AjaxResult progressStatistics(){
+        ProductionProgressDto productionProgressDto = homeService.productionProgress();
+        return AjaxResult.success(productionProgressDto);
+    }
+    @GetMapping("/workInProcessTurnover")
+    @ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
+    public AjaxResult workInProcessTurnover(){
+        ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
+        return AjaxResult.success(productionTurnoverDto);
+    }
+
+
+    /********************************************************璐ㄩ噺绫�*****************************************************/
     @GetMapping("/qualityStatistics")
     @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
     @ApiOperation("璐ㄩ噺鍒嗘瀽")
@@ -62,14 +103,8 @@
         return AjaxResult.success(qualityStatisticsDto);
     }
 
-    @GetMapping("/todos")
-    @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
-    @ApiOperation("寰呭姙浜嬮」")
-    public AjaxResult todos(ApproveProcess req) throws ParseException {
-        List<ApproveProcess> approveProcessList = homeService.todos();
-        return AjaxResult.success(approveProcessList);
-    }
 
+    /********************************************************璐㈠姟绫�*****************************************************/
     @GetMapping("/statisticsReceivablePayable")
     @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
     @ApiOperation("搴旀敹搴斾粯缁熻")
@@ -78,17 +113,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