From 1cf91e355038837f30f2d727507b2229263d7de7 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 27 一月 2026 17:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/home/controller/HomeController.java | 146 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 103 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 62f6715..9cbb122 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -1,7 +1,5 @@
package com.ruoyi.home.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -9,9 +7,6 @@
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import com.ruoyi.production.dto.ProductOrderDto;
-import com.ruoyi.production.dto.ProductWorkOrderDto;
-import com.ruoyi.production.dto.SalesLedgerWorkDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +31,72 @@
@Autowired
private HomeService homeService;
+ /********************************************************鍩虹绫�*****************************************************/
+ @GetMapping("/todos")
+ @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
+ @ApiOperation("寰呭姙浜嬮」")
+ public AjaxResult todos(ApproveProcess req) throws ParseException {
+ List<ApproveProcess> approveProcessList = homeService.todos();
+ return AjaxResult.success(approveProcessList);
+ }
+
+ @GetMapping("/approveAndDeviceTodos")
+ @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
+ public AjaxResult approveAndDeviceTodos(){
+ Map<String, Object> map = homeService.approveAndDeviceTodos();
+ return AjaxResult.success(map);
+ }
+
+ @GetMapping("/noticesCount")
+ @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
+ public AjaxResult noticesCount(){
+ Long count = homeService.noticesCount();
+ return AjaxResult.success(count);
+ }
+
+ @GetMapping("/deptStaffDistribution")
+ @ApiOperation("鍚勯儴闂ㄤ汉鍛樺垎甯�")
+ public AjaxResult deptStaffDistribution() {
+ DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/summaryStatistics")
+ @ApiOperation("鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
+ public AjaxResult summaryStatistics() {
+ HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
+ return AjaxResult.success(homeSummaryDto);
+ }
+
+ @GetMapping("/supplierPurchaseRanking")
+ @ApiOperation("渚涘簲鍟嗛噰璐帓鍚�")
+ public AjaxResult supplierPurchaseRanking(@RequestParam(value = "type", defaultValue = "1") 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) {
+ CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/productCategoryDistribution")
+ @ApiOperation("浜у搧澶х被鍒嗗竷")
+ public AjaxResult productCategoryDistribution() {
+ ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
+ return AjaxResult.success(dto);
+ }
+
+ @GetMapping("/customerContributionRanking")
+ @ApiOperation("瀹㈡埛閲戦璐＄尞鎺掑悕")
+ public AjaxResult customerContributionRanking(@RequestParam(value = "type", defaultValue = "1") Integer type) {
+ List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
+ return AjaxResult.success(list);
+ }
+
+ /********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
@ApiOperation("閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
@@ -53,43 +114,8 @@
return AjaxResult.success(analysisCustomerContractAmounts);
}
- @GetMapping("/qualityStatistics")
- @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
- @ApiOperation("璐ㄩ噺鍒嗘瀽")
- public AjaxResult qualityStatistics(QualityStatisticsDto req) {
- QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
- return AjaxResult.success(qualityStatisticsDto);
- }
- @GetMapping("/todos")
- @Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
- @ApiOperation("寰呭姙浜嬮」")
- public AjaxResult todos(ApproveProcess req) throws ParseException {
- List<ApproveProcess> approveProcessList = homeService.todos();
- return AjaxResult.success(approveProcessList);
- }
-
- @GetMapping("/statisticsReceivablePayable")
- @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
- @ApiOperation("搴旀敹搴斾粯缁熻")
- public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
- StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
- return AjaxResult.success(statisticsReceivablePayable);
- }
-
- @GetMapping("/approveAndDeviceTodos")
- @ApiOperation("瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
- public AjaxResult approveAndDeviceTodos(){
- Map<String, Object> map = homeService.approveAndDeviceTodos();
- return AjaxResult.success(map);
- }
-
- @GetMapping("/noticesCount")
- @ApiOperation("鏈繃鏈熺殑鍏憡鏁伴噺")
- public AjaxResult noticesCount(){
- Long count = homeService.noticesCount();
- return AjaxResult.success(count);
- }
+ /********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/progressStatistics")
@ApiOperation("鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
public AjaxResult progressStatistics(){
@@ -99,7 +125,41 @@
@GetMapping("/workInProcessTurnover")
@ApiOperation("鍦ㄥ埗鍝佸懆杞儏鍐�")
public AjaxResult workInProcessTurnover(){
- Map<Integer, List<ProductWorkOrderDto>> productWorkOrderDtoMap = homeService.workInProcessTurnover();
- return AjaxResult.success(productWorkOrderDtoMap);
+ ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
+ return AjaxResult.success(productionTurnoverDto);
}
+
+
+ /********************************************************璐ㄩ噺绫�*****************************************************/
+ @GetMapping("/qualityStatistics")
+ @Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
+ @ApiOperation("璐ㄩ噺鍒嗘瀽")
+ public AjaxResult qualityStatistics(QualityStatisticsDto req) {
+ QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
+ return AjaxResult.success(qualityStatisticsDto);
+ }
+
+
+ /********************************************************璐㈠姟绫�*****************************************************/
+ @GetMapping("/statisticsReceivablePayable")
+ @Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
+ @ApiOperation("搴旀敹搴斾粯缁熻")
+ public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @RequestParam(value = "type", defaultValue = "1") Integer type ) {
+ StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
+ return AjaxResult.success(statisticsReceivablePayable);
+ }
+
+
+ /********************************************************浠撳偍绫�*****************************************************/
+
+
+
+
+
+
+
+
+
+
+
}
--
Gitblit v1.9.3