From ae659b7fe99a8862082a4ba4bb24148a2a6727ca Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 08 十月 2026 16:57:40 +0800
Subject: [PATCH] feat(芯导): 仓储物流出库 / 人力资源(离职/在职/合同/薪资) / 环保门禁(门禁+智能巡检) 后端
---
src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 ec1f077..8aadf10 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
@@ -67,9 +64,10 @@
accountDto.setIncomeNumber(incomeNumber);
BigDecimal totalIncome = accountIncomes.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
accountDto.setTotalIncome(totalIncome);
- accountIncomes.stream().forEach(accountDto2 -> {
- accountDto2.setProportion(accountDto2.getAccount().divide(totalIncome,2,BigDecimal.ROUND_HALF_UP));
- });
+ accountIncomes.forEach(accountDto2 -> accountDto2.setProportion(
+ totalIncome.compareTo(BigDecimal.ZERO) == 0
+ ? BigDecimal.ZERO
+ : accountDto2.getAccount().divide(totalIncome, 2, BigDecimal.ROUND_HALF_UP)));
accountDto.setIncomeType(accountIncomes);
//鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敮鍑�
List<AccountDto2> accountExpenses =accountExpenseMapper.report(dateQueryDto);
@@ -79,9 +77,10 @@
accountDto.setExpenseNumber(expenseNumber);
BigDecimal totalExpense = accountExpenses.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
accountDto.setTotalExpense(totalExpense);
- accountExpenses.stream().forEach(accountDto2 -> {
- accountDto2.setProportion(accountDto2.getAccount().divide(totalExpense,2,BigDecimal.ROUND_HALF_UP));
- });
+ accountExpenses.forEach(accountDto2 -> accountDto2.setProportion(
+ totalExpense.compareTo(BigDecimal.ZERO) == 0
+ ? BigDecimal.ZERO
+ : accountDto2.getAccount().divide(totalExpense, 2, BigDecimal.ROUND_HALF_UP)));
accountDto.setExpenseType(accountExpenses);
//鍑�鏀跺叆
BigDecimal netRevenue = totalIncome.subtract(totalExpense);
@@ -132,11 +131,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());
@@ -153,10 +154,24 @@
}
@Override
+ public Map<String, Object> categoryReport(DateQueryDto dateQueryDto) {
+ Map<String, Object> result = new HashMap<>();
+ result.put("share", accountExpenseMapper.reportByCategory(dateQueryDto));
+ result.put("trend", accountExpenseMapper.trendByCategory(dateQueryDto));
+ return result;
+ }
+
+ @Override
public AccountExpense getByInvoiceNumber(String purchaseContractNumber) {
return accountExpenseMapper.selectOne(Wrappers.<AccountExpense>lambdaQuery()
.eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
}
+ @Override
+ public List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber) {
+ return accountExpenseMapper.selectList(Wrappers.<AccountExpense>lambdaQuery()
+ .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));
+ }
+
}
--
Gitblit v1.9.3