From 68ba7c6caf92d0cf7097dafc4e829846a2231707 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 05 二月 2026 13:43:05 +0800
Subject: [PATCH] fix: 付款记录状态计算错误
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 54fde04..fcdfc16 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -5,6 +5,7 @@
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.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
import com.ruoyi.dto.MapDto;
@@ -72,21 +73,21 @@
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
- public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
return AjaxResult.success(list);
}
@GetMapping("/customerRevenueAnalysis")
@ApiOperation("瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
- public AjaxResult customerRevenueAnalysis(@RequestParam("customerId") Long customerId, @RequestParam(value = "type", defaultValue = "1") Integer type) {
+ public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
return AjaxResult.success(dto);
}
@GetMapping("/customerContributionRanking")
@ApiOperation("瀹㈡埛閲戦璐＄尞鎺掑悕")
- public AjaxResult customerContributionRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ public AjaxResult customerContributionRanking(@DefaultType Integer type) {
List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
return AjaxResult.success(list);
}
@@ -124,28 +125,28 @@
/********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/inputOutputAnalysis")
@ApiOperation("鎶曞叆浜у嚭鍒嗘瀽")
- public AjaxResult inputOutputAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/processOutputAnalysis")
@ApiOperation("宸ュ簭浜у嚭鍒嗘瀽")
- public AjaxResult processOutputAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult processOutputAnalysis(@DefaultType Integer type){
List<MapDto> list = homeService.processOutputAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/workOrderEfficiencyAnalysis")
@ApiOperation("宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
- public AjaxResult workOrderEfficiencyAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
return AjaxResult.success(list);
}
@GetMapping("/productionAccountingAnalysis")
@ApiOperation("鐢熶骇鏍哥畻鍒嗘瀽")
- public AjaxResult productionAccountingAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
return AjaxResult.success(list);
}
@@ -170,22 +171,29 @@
return AjaxResult.success(productionTurnoverDto);
}
+ @GetMapping("/processDataProductionStatistics")
+ @ApiOperation("宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
+ public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
+ List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
+ return AjaxResult.success(list);
+ }
+
/********************************************************璐ㄩ噺绫�*****************************************************/
@GetMapping("/rawMaterialDetection")
@ApiOperation("鍘熸潗鏂欐娴�")
- public AjaxResult rawMaterialDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult rawMaterialDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.rawMaterialDetection(type));
}
@GetMapping("/processDetection")
@ApiOperation("杩囩▼妫�娴�")
- public AjaxResult processDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult processDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.processDetection(type));
}
@GetMapping("/factoryDetection")
@ApiOperation("鎴愬搧鍑哄巶妫�娴�")
- public AjaxResult factoryDetection(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult factoryDetection(@DefaultType Integer type){
return AjaxResult.success(homeService.factoryDetection(type));
}
@@ -232,10 +240,17 @@
return AjaxResult.success(qualityStatisticsDto);
}
+ @GetMapping("/qualityInspectionStatistics")
+ @ApiOperation("璐ㄩ噺缁熻")
+ public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
+ QualityStatisticsDto dto = homeService.qualityInspectionStatistics(type);
+ return AjaxResult.success(dto);
+ }
+
/********************************************************璐㈠姟绫�*****************************************************/
@GetMapping("/incomeExpenseAnalysis")
@ApiOperation("鏀敹瀵规瘮鍒嗘瀽")
- public AjaxResult incomeExpenseAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
return AjaxResult.success(result);
}
@@ -249,7 +264,7 @@
@GetMapping("/expenseCompositionAnalysis")
@ApiOperation("鏋勬垚鍒嗘瀽")
- public AjaxResult expenseCompositionAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
List<MapDto> list = homeService.expenseCompositionAnalysis(type);
return AjaxResult.success(list);
}
@@ -271,7 +286,7 @@
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
@ApiOperation("搴旀敹搴斾粯缁熻")
- public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
+ public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
return AjaxResult.success(statisticsReceivablePayable);
}
@@ -294,7 +309,7 @@
@GetMapping("/productInOutAnalysis")
@ApiOperation("浜у搧鍑哄叆搴撳垎鏋�")
- public AjaxResult productInOutAnalysis(@RequestParam(value = "type", defaultValue = "1") Integer type){
+ public AjaxResult productInOutAnalysis(@DefaultType Integer type){
List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
return AjaxResult.success(result);
}
--
Gitblit v1.9.3