From bd7a90b45aa2461caf6db78ed29d4cc3401a65c8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 29 五月 2025 17:35:42 +0800
Subject: [PATCH] 来票台账bug修复

---
 src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index b8f233d..6ba3a59 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -1,5 +1,7 @@
 package com.ruoyi.purchase.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
@@ -13,17 +15,17 @@
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 浠樻鐧昏Controller
- * 
+ *
  * @author ruoyi
  * @date 2025-05-15
  */
 @RestController
 @RequestMapping("/purchase/paymentRegistration")
-public class PaymentRegistrationController extends BaseController
-{
+public class PaymentRegistrationController extends BaseController {
     @Autowired
     private IPaymentRegistrationService paymentRegistrationService;
 
@@ -32,8 +34,7 @@
      */
 //    @PreAuthorize("@ss.hasPermi('system:registration:list')")
     @GetMapping("/list")
-    public TableDataInfo list(PaymentRegistrationDto paymentRegistrationDto)
-    {
+    public TableDataInfo list(PaymentRegistrationDto paymentRegistrationDto) {
         startPage();
         List<PaymentRegistrationDto> list = paymentRegistrationService.selectPaymentRegistrationList(paymentRegistrationDto);
         return getDataTable(list);
@@ -55,8 +56,7 @@
      * 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
      */
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(paymentRegistrationService.selectPaymentRegistrationById(id));
     }
 
@@ -65,8 +65,7 @@
      */
     @Log(title = "浠樻鐧昏", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody PaymentRegistration paymentRegistration)
-    {
+    public AjaxResult add(@RequestBody PaymentRegistration paymentRegistration) {
         return toAjax(paymentRegistrationService.insertPaymentRegistration(paymentRegistration));
     }
 
@@ -75,8 +74,7 @@
      */
     @Log(title = "浠樻鐧昏", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration)
-    {
+    public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration) {
         return toAjax(paymentRegistrationService.updatePaymentRegistration(paymentRegistration));
     }
 
@@ -84,9 +82,8 @@
      * 鍒犻櫎浠樻鐧昏
      */
     @Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
-	@DeleteMapping("/del")
-    public AjaxResult remove(@RequestBody Long[] ids)
-    {
+    @DeleteMapping("/del")
+    public AjaxResult remove(@RequestBody Long[] ids) {
         return toAjax(paymentRegistrationService.deletePaymentRegistrationByIds(ids));
     }
 
@@ -94,8 +91,7 @@
      * 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
      */
     @GetMapping(value = "/byPurchaseId/{id}")
-    public AjaxResult getPurchaseInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getPurchaseInfo(@PathVariable("id") Long id) {
         return success(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
     }
 
@@ -103,8 +99,18 @@
      * 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
      */
     @GetMapping(value = "/paymentLedgerList")
-    public AjaxResult paymentLedgerList(PaymentLedgerDto paymentLedgerDto)
-    {
-        return success(paymentRegistrationService.selectPaymentLedgerList(paymentLedgerDto));
+    public AjaxResult paymentLedgerList(PaymentLedgerDto paymentLedgerDto, Page page,
+                                        Integer detailPageNum,
+                                        Integer detailPageSize) {
+        IPage<Map<String, Object>> mapIPage = paymentRegistrationService.selectPaymentLedgerList(paymentLedgerDto, page, detailPageNum, detailPageSize);
+        return success(mapIPage);
+    }
+
+    /**
+     * 鑾峰彇鏈湀搴斾粯淇℃伅
+     */
+    @GetMapping(value = "/paymentMonthList")
+    public AjaxResult paymentMonthList() {
+        return success(paymentRegistrationService.paymentMonthList());
     }
 }

--
Gitblit v1.9.3