From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 582589d..6411be5 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -18,12 +18,17 @@
import com.ruoyi.sales.service.ReceiptPaymentService;
import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -160,6 +165,7 @@
return receiptPaymentService.receiptPaymentHistoryListPage(page,receiptPaymentDto);
}
+ private static final ZoneId DEFAULT_ZONE_ID = ZoneId.systemDefault();
/**
* 瀵煎嚭鍥炴娴佹按鍒楄〃
*/
@@ -175,9 +181,12 @@
salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+ receiptPaymentRecordDto1.setInvoiceDate(Date.from(receiptPaymentRecordDto.getCreateTime().atZone(DEFAULT_ZONE_ID).toInstant()));
+ receiptPaymentRecordDto1.setReceiptPaymentAmountTotal(receiptPaymentRecordDto.getReceiptPaymentAmount());
+ BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
});
- util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
+ util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭鍥炴娴佹按鍒楄〃");
}
/**
--
Gitblit v1.9.3