From dfa9258c8879dbb0d1bfc00d7f939031d0bb623b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 29 一月 2026 18:32:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/service/HomeService.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 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 266a8ce..5bb6b17 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -1,10 +1,8 @@
package com.ruoyi.home.service;
import com.ruoyi.approve.pojo.ApproveProcess;
-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.dto.MapDto;
+import com.ruoyi.home.dto.*;
import java.text.ParseException;
import java.util.List;
@@ -29,4 +27,41 @@
StatisticsReceivablePayableDto statisticsReceivablePayable(Integer type);
Map<String, Object> approveAndDeviceTodos();
+
+ Long noticesCount();
+
+ ProductionProgressDto productionProgress();
+ ProductionTurnoverDto workInProcessTurnover();
+
+ DeptStaffDistributionDto deptStaffDistribution();
+
+ HomeSummaryDto summaryStatistics();
+
+ List<SupplierPurchaseRankingDto> supplierPurchaseRanking(Integer type);
+
+ CustomerRevenueAnalysisDto customerRevenueAnalysis(Long customerId, Integer type);
+
+ ProductCategoryDistributionDto productCategoryDistribution();
+
+ List<CustomerContributionRankingDto> customerContributionRanking(Integer type);
+
+ List<MapDto> productSalesAnalysis();
+
+ List<MapDto> rawMaterialPurchaseAmountRatio();
+
+ List<MapDto> salesPurchaseStorageProductCount();
+
+ List<Map<String, Object>> productInOutAnalysis(Integer type);
+
+ List<MapDto> productTurnoverDays();
+
+ List<Map<String, Object>> incomeExpenseAnalysis(Integer type);
+
+ List<MapDto> profitTrendAnalysis();
+
+ List<MapDto> expenseCompositionAnalysis(Integer type);
+
+ MonthlyIncomeDto monthlyIncome();
+
+ MonthlyExpenditureDto monthlyExpenditure();
}
--
Gitblit v1.9.3