From 005e11377f508e3a79b528572a386a2af43697ca Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 09 一月 2026 16:24:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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..62f6715 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;
@@ -88,7 +87,19 @@
@GetMapping("/noticesCount")
@ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
public AjaxResult noticesCount(){
- Long count = homeService.noticesCount();
+ Long count = homeService.noticesCount();
return AjaxResult.success(count);
}
+ @GetMapping("/progressStatistics")
+ @ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
+ public AjaxResult progressStatistics(){
+ ProductionProgressDto productionProgressDto = homeService.productionProgress();
+ return AjaxResult.success(productionProgressDto);
+ }
+ @GetMapping("/workInProcessTurnover")
+ @ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
+ public AjaxResult workInProcessTurnover(){
+ Map<Integer, List<ProductWorkOrderDto>> productWorkOrderDtoMap = homeService.workInProcessTurnover();
+ return AjaxResult.success(productWorkOrderDtoMap);
+ }
}
--
Gitblit v1.9.3