From 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 29 一月 2026 18:11:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/service/HomeService.java | 46 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 42 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 1902488..5bb6b17 100644
--- a/src/main/java/com/ruoyi/home/service/HomeService.java
+++ b/src/main/java/com/ruoyi/home/service/HomeService.java
@@ -1,13 +1,12 @@
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;
+import java.util.Map;
/**
* @author :yys
@@ -26,4 +25,43 @@
List<ApproveProcess> todos() throws ParseException;
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