From 18e1abc0c5623137e9689d4bd30701d946e4cd88 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期六, 24 十月 2026 15:44:18 +0800
Subject: [PATCH] fix(营销): 回款流水导出全空(copyBeanProp参数顺序反了+字段名不匹配)、开票台账SQL漏字段invoice_registration_product_id/invoice_total
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 0801107..8741b58 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -22,8 +22,10 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.time.ZoneId;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -174,10 +176,20 @@
List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
- BeanUtils.copyBeanProp(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+ // copyBeanProp(Object dest, Object src)锛氱涓�涓弬鏁版槸鐩爣锛岀浜屼釜鏄簮
+ BeanUtils.copyBeanProp(receiptPaymentRecordDto1, receiptPaymentRecordDto);
+ // 瀛楁鍚嶄笉涓�鑷寸殑鎵嬪姩琛ラ綈
+ receiptPaymentRecordDto1.setReceiptPaymentAmountTotal(receiptPaymentRecordDto.getReceiptPaymentAmount());
+ if (receiptPaymentRecordDto1.getReceiptPaymentType() == null) {
+ receiptPaymentRecordDto1.setReceiptPaymentType(receiptPaymentRecordDto.getReceiptPaymentType());
+ }
+ if (receiptPaymentRecordDto.getCreateTime() != null) {
+ receiptPaymentRecordDto1.setInvoiceDate(Date.from(
+ receiptPaymentRecordDto.getCreateTime().atZone(ZoneId.systemDefault()).toInstant()));
+ }
receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
});
- util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
+ util.exportExcel(response, receiptPaymentRecordDtos, "鍥炴娴佹按鍒楄〃");
}
/**
--
Gitblit v1.9.3