From ab01a0f611c0adb97662bc8f548ca4a911ec8045 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:37:39 +0800
Subject: [PATCH] 分页修改
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 6549c3b..6669842 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -1,7 +1,11 @@
package com.ruoyi.sales.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.InvoicePurchaseDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
import com.ruoyi.sales.pojo.ReceiptPayment;
import com.ruoyi.sales.service.ReceiptPaymentService;
@@ -13,7 +17,7 @@
@RestController
@RequestMapping("/receiptPayment")
-public class ReceiptPaymentController {
+public class ReceiptPaymentController extends BaseController {
@Autowired
private ReceiptPaymentService receiptPaymentService;
@@ -76,10 +80,10 @@
@GetMapping("/getReceiptAmount")
public AjaxResult getReceiptAmount() {
try {
- BigDecimal amount = receiptPaymentService.getReceiptAmount();
- return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
+ BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
+ return AjaxResult.success(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
} catch (Exception e) {
- return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+ return AjaxResult.error("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
}
}
@@ -103,4 +107,30 @@
public AjaxResult invoiceInfo (Integer id) {
return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
}
+
+ /**
+ * 鏈湀搴旀敹,鍥炴閲戦
+ */
+ @GetMapping("/getAmountMouth")
+ public AjaxResult getAmountMouth() {
+ return AjaxResult.success(receiptPaymentService.getAmountMouth());
+ }
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ @GetMapping("/receiptPaymentHistoryList")
+ public TableDataInfo receiptPaymentHistoryList(ReceiptPaymentDto receiptPaymentDto) {
+ startPage();
+ List<ReceiptPaymentDto> list = receiptPaymentService.receiptPaymentHistoryList(receiptPaymentDto);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ鍥炴璁板綍
+ */
+ @GetMapping("/receiptPaymentHistoryListPage")
+ public IPage<ReceiptPaymentDto> receiptPaymentHistoryListPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
+ }
}
--
Gitblit v1.9.3