From fea3d6cbb624a3c9df6e1ae344a10b71110be439 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期五, 26 九月 2025 15:37:03 +0800
Subject: [PATCH] Merge branch 'pim_ywx'
---
src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 6ba3a59..93bca78 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -7,6 +7,7 @@
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -88,6 +89,15 @@
}
/**
+ * 鍒犻櫎浠樻鐧昏
+ */
+ @Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
+ @DeleteMapping("/delete")
+ public AjaxResult delete(@RequestBody Long[] ids) {
+ return toAjax(paymentRegistrationService.delete(ids));
+ }
+
+ /**
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/byPurchaseId/{id}")
@@ -113,4 +123,39 @@
public AjaxResult paymentMonthList() {
return success(paymentRegistrationService.paymentMonthList());
}
+
+ /**
+ * 鏌ヨ浠樻鐧昏鍒楄〃
+ *
+ * @param paymentRegistrationDto 浠樻鐧昏
+ * @return 浠樻鐧昏闆嗗悎
+ */
+ @GetMapping("/paymentHistoryList")
+ public TableDataInfo paymentHistoryList(PaymentRegistrationDto paymentRegistrationDto) {
+ startPage();
+ List<PaymentRegistrationDto> list = paymentRegistrationService.paymentHistoryList(paymentRegistrationDto);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ渚涘簲鍟嗗線鏉ヨ褰�
+ * @param supplierId
+ * @return
+ */
+ @GetMapping("/getPaymentRecordList/{supplierId}")
+ public AjaxResult getPaymentRecordList(@PathVariable Long supplierId) {
+ List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationService.getPaymentRecordList(supplierId);
+ return success(paymentRecordList);
+ }
+
+ /**
+ * 鏌ヨ浠樻鐧昏鍒楄〃
+ *
+ * @param paymentRegistrationDto 浠樻鐧昏
+ * @return 浠樻鐧昏闆嗗悎
+ */
+ @GetMapping("/paymentHistoryListPage")
+ public IPage<PaymentRegistrationDto> paymentHistoryListPage(Page page, PaymentRegistrationDto paymentRegistrationDto) {
+ return paymentRegistrationService.paymentHistoryListPage(page,paymentRegistrationDto);
+ }
}
--
Gitblit v1.9.3