From 09361264d6d87b8ce57b61a26c5507dbc0a01031 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:16:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_建诚恒商贸' into dev_天津_玮苓乐器
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 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 35c3954..e4ba711 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -104,8 +104,10 @@
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@Operation(summary = "渚涘簲鍟嗛噰璐帓鍚�")
- public R supplierPurchaseRanking(@DefaultType Integer type) {
- List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
+ public R supplierPurchaseRanking(@DefaultType Integer type,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type, startDate, endDate);
return R.ok(list);
}
@@ -118,22 +120,28 @@
@GetMapping("/customerContributionRanking")
@Operation(summary = "瀹㈡埛閲戦璐＄尞鎺掑悕")
- public R customerContributionRanking(@DefaultType Integer type) {
- List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
+ public R customerContributionRanking(@DefaultType Integer type,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type, startDate, endDate);
return R.ok(list);
}
@GetMapping("/productSalesAnalysis")
@Operation(summary = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
- public R productSalesAnalysis() {
- List<MapDto> list = homeService.productSalesAnalysis();
+ public R productSalesAnalysis(
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ List<MapDto> list = homeService.productSalesAnalysis(startDate, endDate);
return R.ok(list);
}
@GetMapping("/rawMaterialPurchaseAmountRatio")
@Operation(summary = "鍘熸潗鏂欓噰璐噾棰濆崰姣�")
- public R rawMaterialPurchaseAmountRatio(){
- List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
+ public R rawMaterialPurchaseAmountRatio(
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate){
+ List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio(startDate, endDate);
return R.ok(list);
}
@@ -474,22 +482,28 @@
@GetMapping("/salesPurchaseStorageProductCount")
@Operation(summary = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
- public R salesPurchaseStorageProductCount(){
- List<MapDto> list = homeService.salesPurchaseStorageProductCount();
+ public R salesPurchaseStorageProductCount(
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate){
+ List<MapDto> list = homeService.salesPurchaseStorageProductCount(startDate, endDate);
return R.ok(list);
}
@GetMapping("/productInOutAnalysis")
@Operation(summary = "浜у搧鍑哄叆搴撳垎鏋�")
- public R productInOutAnalysis(@DefaultType Integer type){
- List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
+ public R productInOutAnalysis(@DefaultType Integer type,
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate){
+ List<Map<String, Object>> result = homeService.productInOutAnalysis(type, startDate, endDate);
return R.ok(result);
}
@GetMapping("/productTurnoverDays")
@Operation(summary = "浜у搧鍛ㄨ浆澶╂暟")
- public R productTurnoverDays(){
- List<MapDto> list = homeService.productTurnoverDays();
+ public R productTurnoverDays(
+ @RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate){
+ List<MapDto> list = homeService.productTurnoverDays(startDate, endDate);
return R.ok(list);
}
--
Gitblit v1.9.3