From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 61 +++++++++++++++++++++++++++---
1 files changed, 55 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 3078365..98b1105 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -1,19 +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;
@@ -50,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));
}
/**
@@ -94,6 +102,21 @@
return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
}
+ @ApiModelProperty("瀵煎嚭鍥炴鐧昏")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, String ids) {
+ if (ids == null || ids.isEmpty()) {
+ receiptPaymentService.exportPaymentList(response, null);
+ } else {
+ ArrayList<Long> idList = (ArrayList<Long>) Arrays.stream(ids.split(","))
+ .map(s -> s.replaceAll("[\\[\\]]", "").trim())
+ .map(Long::valueOf)
+ .collect(Collectors.toList());
+ receiptPaymentService.exportPaymentList(response, idList);
+ }
+ }
+
+
/**
* 寮�绁ㄥ彴璐﹁鎯�
* @param id
@@ -111,4 +134,30 @@
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