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 | 25 +++++++++++++++++--------
1 files changed, 17 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 577508a..039ba67 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -41,18 +41,27 @@
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")
- @Log(title = "瀹㈡埛寰�鏉�", businessType = BusinessType.OTHER)
- @Operation(summary = "瀹㈡埛寰�鏉�")
- public R customewTransactions(Page page, String customerName) {
- return R.ok(customerService.customewTransactions(page,customerName));
+ @Operation(summary = "钀ラ攢绠＄悊--瀹㈡埛寰�鏉�-瀹㈡埛姹囨��")
+ public R customewTransactions(Page page, Long projectId, String customerName, String contractName) {
+ return R.ok(customerService.customewTransactions(page, projectId, customerName, contractName));
}
@GetMapping("/customewTransactionsDetails")
- @Log(title = "瀹㈡埛寰�鏉ユ槑缁�", businessType = BusinessType.OTHER)
- @Operation(summary = "瀹㈡埛寰�鏉ユ槑缁�")
- public R customewTransactionsDetails(Page page, Long customerId) {
- return R.ok(customerService.customewTransactionsDetails(page,customerId));
+ @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