From 49133ae6eafda4d6bd86ed9a9241177a12a47348 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 26 五月 2026 16:07:30 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 56b7ddb..577508a 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,11 +1,16 @@
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 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;
@@ -15,24 +20,39 @@
* @author :yys
* @date : 2026/1/15 9:39
*/
-@Api(tags = "鎸囨爣缁熻")
+@Tag(name = "鎸囨爣缁熻")
@RestController
@RequestMapping("/metricStatistics")
@AllArgsConstructor
public class MetricStatisticsController extends BaseController {
- 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("/customewTransactions")
+ @Log(title = "瀹㈡埛寰�鏉�", businessType = BusinessType.OTHER)
+ @Operation(summary = "瀹㈡埛寰�鏉�")
+ public R customewTransactions(Page page, String customerName) {
+ return R.ok(customerService.customewTransactions(page,customerName));
+ }
+
+ @GetMapping("/customewTransactionsDetails")
+ @Log(title = "瀹㈡埛寰�鏉ユ槑缁�", businessType = BusinessType.OTHER)
+ @Operation(summary = "瀹㈡埛寰�鏉ユ槑缁�")
+ public R customewTransactionsDetails(Page page, Long customerId) {
+ return R.ok(customerService.customewTransactionsDetails(page,customerId));
+ }
+
}
--
Gitblit v1.9.3