From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态（回款完成，未完成） 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制，过时后状态改为已过期
---
src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
index d17b424..a7ab8cf 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -25,10 +25,7 @@
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@AllArgsConstructor
@Service
@@ -132,11 +129,13 @@
.eq(AccountIncome::getInputTime, date.toString()))
.stream()
.map(AccountIncome::getIncomeMoney)
+ .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal totalExpense = accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
.eq(AccountExpense::getInputTime, date.toString()))
.stream()
.map(AccountExpense::getExpenseMoney)
+ .filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal netIncome = totalIncome.subtract(totalExpense);
days.add(date.toString());
@@ -152,5 +151,11 @@
return result;
}
+ @Override
+ public AccountExpense getByInvoiceNumber(String purchaseContractNumber) {
+ return accountExpenseMapper.selectOne(Wrappers.<AccountExpense>lambdaQuery()
+ .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
+ }
+
}
--
Gitblit v1.9.3