From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 11:45:48 +0800
Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】，合同金额列后面增加已开票金额、待开票金额两列

---
 src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java |  104 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 5697f89..ec9ce02 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -1,18 +1,28 @@
 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;
+import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/receiptPayment")
-public class ReceiptPaymentController {
+public class ReceiptPaymentController extends BaseController {
 
     @Autowired
     private ReceiptPaymentService receiptPaymentService;
@@ -49,14 +59,13 @@
     }
 
     /**
-     * 鍥炴鐧昏鍒嗛〉鏌ヨ
-     * @param page
+     * 瀹㈡埛寰�鏉ヨ褰曟煡璇�
      * @param receiptPaymentDto
      * @return
      */
-    @GetMapping("/listPage")
-    public AjaxResult receiptPaymentListPage (Page page, ReceiptPaymentDto receiptPaymentDto) {
-        return AjaxResult.success(receiptPaymentService.receiptPaymentListPage(page,receiptPaymentDto));
+    @GetMapping("/customerInteractions")
+    public AjaxResult customerInteractions (ReceiptPaymentDto receiptPaymentDto) {
+        return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
     }
 
     /**
@@ -69,5 +78,88 @@
         return AjaxResult.success(receiptPaymentService.receiptPaymentInfo(id));
     }
 
+    /**
+     * 鏈湀鍥炴閲戦
+     */
+    @GetMapping("/getReceiptAmount")
+    public AjaxResult getReceiptAmount() {
+        try {
+            BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
+            return AjaxResult.success(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
+        } catch (Exception e) {
+            return AjaxResult.error("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
+        }
+    }
 
+    /**
+     * 鏌ヨ宸茬粡缁戝畾鍙戠エ鐨勫紑绁ㄥ彴璐�
+     * @param page
+     * @param receiptPaymentDto
+     * @return
+     */
+    @GetMapping("/bindInvoiceNoRegPage")
+    public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+        return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
+    }
+
+    @ApiModelProperty("瀵煎嚭鍥炴鐧昏")
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, @RequestParam("ids") String idsStr) {
+        if (idsStr == null || idsStr.trim().isEmpty()) {
+            throw new RuntimeException("璇烽�夋嫨瑕佸鍑虹殑璁板綍");
+        }
+
+        ArrayList<Long> ids = (ArrayList<Long>) Arrays.stream(idsStr.split(","))
+                .map(s -> s.replaceAll("[\\[\\]]", "").trim())
+                .map(Long::valueOf)
+                .collect(Collectors.toList());
+
+
+        receiptPaymentService.exportPaymentList(response, ids);
+    }
+
+
+    /**
+     * 寮�绁ㄥ彴璐﹁鎯�
+     * @param id
+     * @return
+     */
+    @GetMapping("/invoiceInfo")
+    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);
+    }
+
+    /**
+     * 鏌ヨ鍥炴璁板綍涓嶅垎椤�
+     */
+    @GetMapping("/receiptPaymentHistoryListNoPage")
+    public List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage(ReceiptPaymentDto receiptPaymentDto) {
+        return receiptPaymentService.receiptPaymentHistoryListNoPage(receiptPaymentDto);
+    }
 }

--
Gitblit v1.9.3