From 389b60c882b93a8e06600e1ab14c5b60a2a2878d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 28 七月 2025 18:07:50 +0800
Subject: [PATCH] yys 修改bug
---
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index d346d41..08ff1ad 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -29,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -78,6 +79,8 @@
@Override
public HomeBusinessDto business() {
+ // 鏋勫缓缁撴灉
+ HomeBusinessDto homeBusinessDto = new HomeBusinessDto();
LocalDate now = LocalDate.now();
YearMonth currentMonth = YearMonth.from(now);
// 鍒涘缓LambdaQueryWrapper
@@ -85,6 +88,9 @@
salesLedgerLambdaQueryWrapper.ge(SalesLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
.lt(SalesLedger::getEntryDate, currentMonth.plusMonths(1).atDay(1).atStartOfDay()); // 灏忎簬涓嬫湀绗竴澶�
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(salesLedgerLambdaQueryWrapper);
+ if(CollectionUtils.isEmpty(salesLedgers)){
+ return homeBusinessDto;
+ }
// 鍚堣鍚堝悓閲戦
BigDecimal contractAmount = salesLedgers.stream().map(SalesLedger::getContractAmount)
.filter(Objects::nonNull)
@@ -97,7 +103,8 @@
BigDecimal noInvoiceAmountTotal = salesLedgerProducts.stream().map(SalesLedgerProduct::getNoInvoiceAmount)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
-
+ homeBusinessDto.setMonthSaleMoney(contractAmount);
+ homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal);
// 鍒涘缓LambdaQueryWrapper
LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.ge(PurchaseLedger::getEntryDate, currentMonth.atDay(1).atStartOfDay()) // 澶т簬绛変簬鏈湀绗竴澶�
@@ -105,6 +112,9 @@
// 鎵ц鏌ヨ骞惰绠楁�诲拰
List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(queryWrapper);
+ if(CollectionUtils.isEmpty(purchaseLedgers)){
+ return homeBusinessDto;
+ }
LambdaQueryWrapper<SalesLedgerProduct> salesLedgerProductMapperLambdaQueryWrapperCopy = new LambdaQueryWrapper<SalesLedgerProduct>();
salesLedgerProductMapperLambdaQueryWrapper.eq(SalesLedgerProduct::getType, 2)
@@ -142,15 +152,11 @@
.map(ProcurementRecordStorage::getInboundNum)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- // 鏋勫缓缁撴灉
- HomeBusinessDto homeBusinessDto = new HomeBusinessDto();
- homeBusinessDto.setMonthSaleMoney(contractAmount);
- homeBusinessDto.setMonthSaleHaveMoney(noInvoiceAmountTotal);
+
homeBusinessDto.setMonthPurchaseMoney(receiveAmount);
homeBusinessDto.setMonthPurchaseHaveMoney(unReceiptPaymentAmount);
homeBusinessDto.setInventoryNum(stock);
homeBusinessDto.setTodayInventoryNum(stockAmount1);
-
return homeBusinessDto;
}
--
Gitblit v1.9.3