From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index ee31a4b..f265ab0 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -1,9 +1,11 @@
package com.ruoyi.purchase.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,6 +20,8 @@
@RequestMapping("/purchase/report")
@AllArgsConstructor
public class AccountingReportController {
+
+ private final ISupplierService supplierService;
@GetMapping("/list")
@@ -44,4 +48,18 @@
@Operation(summary = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿")
public void exportTwo(HttpServletResponse response) {
}
+
+ @GetMapping("/supplierTransactions")
+ @Log(title = "渚涘簲鍟嗗線鏉�", businessType = BusinessType.OTHER)
+ @Operation(summary = "渚涘簲鍟嗗線鏉�")
+ public R supplierTransactions(Page page, String supplierName) {
+ return R.ok(supplierService.supplierTransactions(page,supplierName));
+ }
+
+ @GetMapping("/supplierTransactionsDetails")
+ @Log(title = "渚涘簲鍟嗗線鏉ユ槑缁�", businessType = BusinessType.OTHER)
+ @Operation(summary = "渚涘簲鍟嗗線鏉ユ槑缁�")
+ public R supplierTransactionsDetails(Page page, Long supplierId) {
+ return R.ok(supplierService.supplierTransactionsDetails(page,supplierId));
+ }
}
--
Gitblit v1.9.3