From db628292cb9b69b901b44b146ac88c5f68e38389 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 14:52:54 +0800
Subject: [PATCH] 财务管理系统模块优化
---
src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 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 a3c775f..8aadf10 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -64,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);
@@ -76,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);
@@ -152,6 +154,14 @@
}
@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));
--
Gitblit v1.9.3