From c58c68283ec0d1832143f7e3add43f24b8aba374 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 02 四月 2026 10:03:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/home/service/HomeService.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/HomeService.java b/src/main/java/com/ruoyi/home/service/HomeService.java
index 82dc5a6..f6f6a50 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -98,13 +98,33 @@
Map<String,Long> total();
- String salesAnalysis(SalesDeliveryDto salesDeliveryDto);
+ SalesTotalDto salesAnalysis(SalesDeliveryDto salesDeliveryDto);
- String salesRanking(SalesDeliveryDto salesDeliveryDto);
+ List<SalesTotalDetailDto> salesRanking(SalesDeliveryDto salesDeliveryDto);
- String salesAmount(SalesDeliveryDto salesDeliveryDto);
+ SalesTotalDto salesAmount(SalesDeliveryDto salesDeliveryDto);
- String salesDataRanking(SalesDeliveryDto salesDeliveryDto);
+ List<SalesTotalDetailDto> salesDataRanking(SalesDeliveryDto salesDeliveryDto);
SalesTotalDto customerTrends(SalesDeliveryDto salesDeliveryDto);
+
+ Map<String,List<MaterialProductionAnalysisDto>> materialProductionAnalysis(productionStatisticsDto dto);
+
+ List<String> getMaterials(Integer materialType);
+
+ List<ProductionCostAnalysisDto> productionCostAnalysis(productionStatisticsDto dto, Integer materialType);
+
+ ProductionStatisticsMiddleDto middle();
+
+ List<SolidWasteStatisticsDto> solidWaste(productionStatisticsDto dto);
+
+ List<HomeEnergyStatisticsDto> energy(productionStatisticsDto dto);
+
+ SolidWasteCoreIndicatorsDto coreIndicators(productionStatisticsDto dto);
+
+ List<SolidWasteStatisticsDto> trends(productionStatisticsDto dto);
+
+ List<MapDto> typeDistribution(productionStatisticsDto dto);
+
+ Map<String,Long> manage();
}
--
Gitblit v1.9.3