From bd7a90b45aa2461caf6db78ed29d4cc3401a65c8 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 29 五月 2025 17:35:42 +0800
Subject: [PATCH] 来票台账bug修复
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 1b33c06..08189ff 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -82,11 +82,7 @@
@Override
public List<SalesLedger> selectSalesLedgerList(SalesLedgerDto salesLedgerDto) {
- LambdaQueryWrapper<SalesLedger> queryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.isNotBlank(salesLedgerDto.getCustomerName())) {
- queryWrapper.eq(SalesLedger::getCustomerName, salesLedgerDto.getCustomerName());
- }
- return salesLedgerMapper.selectList(queryWrapper);
+ return salesLedgerMapper.selectSalesLedgerList(salesLedgerDto);
}
public SalesLedgerDto getSalesLedgerWithProducts(SalesLedgerDto salesLedgerDto) {
@@ -100,6 +96,9 @@
LambdaQueryWrapper<SalesLedgerProduct> productWrapper = new LambdaQueryWrapper<>();
productWrapper.eq(SalesLedgerProduct::getSalesLedgerId, salesLedger.getId());
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
+ for (SalesLedgerProduct product : products) {
+ product.setOriginalNoInvoiceNum(product.getNoInvoiceNum());
+ }
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
@@ -232,7 +231,7 @@
monthlyAmounts.add(monthlyAmount);
}
-
+ Collections.reverse(monthlyAmounts);
return monthlyAmounts;
}
--
Gitblit v1.9.3