From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 3c610a1..039ba67 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,12 +1,17 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.service.ICustomerService;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -15,24 +20,48 @@
* @author :yys
* @date : 2026/1/15 9:39
*/
-@Api(tags = "鎸囨爣缁熻")
+@Tag(name = "鎸囨爣缁熻")
@RestController
@RequestMapping("/metricStatistics")
+@AllArgsConstructor
public class MetricStatisticsController extends BaseController {
- @Autowired
- private MetricStatisticsServiceImpl metricStatisticsService;
+ private final MetricStatisticsServiceImpl metricStatisticsService;
+ private final ICustomerService customerService;
- @ApiOperation("澶撮儴鎬昏")
+ @Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
public AjaxResult total() {
return metricStatisticsService.total();
}
- @ApiOperation("缁熻琛�")
+ @Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
}
+ @GetMapping("/projectTransactions")
+ @Operation(summary = "钀ラ攢绠＄悊--瀹㈡埛寰�鏉�-椤圭洰姹囨��")
+ public R projectTransactions(Page page, String projectName, String customerName, String contractName) {
+ return R.ok(customerService.projectTransactions(page, projectName, customerName, contractName));
+ }
+
+ @GetMapping("/customewTransactions")
+ @Operation(summary = "钀ラ攢绠＄悊--瀹㈡埛寰�鏉�-瀹㈡埛姹囨��")
+ public R customewTransactions(Page page, Long projectId, String customerName, String contractName) {
+ return R.ok(customerService.customewTransactions(page, projectId, customerName, contractName));
+ }
+
+ @GetMapping("/customewTransactionsDetails")
+ @Operation(summary = "钀ラ攢绠＄悊--瀹㈡埛寰�鏉ユ槑缁�-鍚堝悓绾�")
+ public R customewTransactionsDetails(Page page, Long projectId, Long customerId, String contractName) {
+ return R.ok(customerService.customewTransactionsDetails(page, projectId, customerId, contractName));
+ }
+
+ @GetMapping("/transactionsSummary")
+ @Operation(summary = "钀ラ攢绠＄悊--瀹㈡埛寰�鏉�-澶х洏鎬昏")
+ public R transactionsSummary() {
+ return R.ok(customerService.transactionsSummary());
+ }
}
--
Gitblit v1.9.3