From b04055af37ba07f8ba8d97cee37c461cecd4a6f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 18:02:15 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 11 ++++++++++-
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 10 ++++++----
src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java | 2 ++
3 files changed, 18 insertions(+), 5 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..d1f000c 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();
/**
* 瀵煎嚭鍥炴娴佹按鍒楄〃
*/
@@ -172,9 +178,12 @@
IPage<ReceiptPaymentDto> salesLedgerIPage = receiptPaymentHistoryListPage(page, salesLedgerDto);
ExcelUtil<ReceiptPaymentRecordDto> util = new ExcelUtil<ReceiptPaymentRecordDto>(ReceiptPaymentRecordDto.class);
List<ReceiptPaymentRecordDto> receiptPaymentRecordDtos = new ArrayList<>();
+ DateTimeFormatter dateTimeFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd");
salesLedgerIPage.getRecords().forEach(receiptPaymentRecordDto -> {
ReceiptPaymentRecordDto receiptPaymentRecordDto1 = new ReceiptPaymentRecordDto();
- BeanUtils.copyBeanProp(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+ BeanUtils.copyProperties(receiptPaymentRecordDto, receiptPaymentRecordDto1);
+ receiptPaymentRecordDto1.setInvoiceDate(Date.from(receiptPaymentRecordDto.getCreateTime().atZone(DEFAULT_ZONE_ID).toInstant()));
+ receiptPaymentRecordDto1.setReceiptPaymentAmountTotal(receiptPaymentRecordDto.getReceiptPaymentAmount());
receiptPaymentRecordDtos.add(receiptPaymentRecordDto1);
});
util.exportExcel(response, receiptPaymentRecordDtos, "瀵煎嚭寮�绁ㄧ櫥璁板垪琛�");
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index c384520..d2f7a36 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -206,15 +206,17 @@
List<Long> salesLedgerIds = iPage.getRecords().stream().map(SalesLedger::getId).collect(Collectors.toList());
List<InvoiceLedgerDto> invoiceLedgerDtoList = invoiceLedgerMapper.invoicedTotal(salesLedgerIds);
if(CollectionUtils.isEmpty(invoiceLedgerDtoList)){
- iPage.setTotal(iPage.getRecords().size());
- return iPage;
+ invoiceLedgerDtoList = new ArrayList<>();
}
// 璁＄畻鍥炴閲戦锛屽緟鍥炴閲戦
List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
.in(InvoiceRegistrationProduct::getSalesLedgerId, salesLedgerIds));
+ List<InvoiceLedger> invoiceLedgers = new ArrayList<>();
+ if(!CollectionUtils.isEmpty(invoiceRegistrationProducts)){
+ invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
+ .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
+ }
- List<InvoiceLedger> invoiceLedgers = invoiceLedgerMapper.selectList(new LambdaQueryWrapper<InvoiceLedger>()
- .in(InvoiceLedger::getInvoiceRegistrationProductId, invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getId).collect(Collectors.toList())));
List<ReceiptPayment> receiptPayments = new ArrayList<>();
if(!CollectionUtils.isEmpty(invoiceLedgers)){
receiptPayments = receiptPaymentMapper.selectList(new LambdaQueryWrapper<ReceiptPayment>()
diff --git a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
index 23a2557..9cb3929 100644
--- a/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java
@@ -1,6 +1,7 @@
package com.ruoyi.sales.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -67,6 +68,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
--
Gitblit v1.9.3