From 161c5e12e3d7f5e2f4345ed3609fe05037ea2b23 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期一, 25 五月 2026 17:15:05 +0800
Subject: [PATCH] feat: 大屏调整
---
src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java | 97 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 24 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..feb6522 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -22,6 +22,7 @@
import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
@@ -56,31 +57,70 @@
@Override
public AccountDto report(DateQueryDto dateQueryDto) {
AccountDto accountDto = new AccountDto();
- //鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敹鍏�
- List<AccountDto2> accountIncomes =accountIncomeMapper.report(dateQueryDto);
+
+ // 鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敹鍏�
+ List<AccountDto2> accountIncomes = accountIncomeMapper.report(dateQueryDto);
+ if (accountIncomes == null) {
+ accountIncomes = Collections.emptyList();
+ }
Long incomeNumber = accountIncomeMapper.selectCount(Wrappers.<AccountIncome>lambdaQuery()
.between(AccountIncome::getIncomeDate, dateQueryDto.getEntryDateStart(), dateQueryDto.getEntryDateEnd()));
accountDto.setIncomeNumber(incomeNumber);
- BigDecimal totalIncome = accountIncomes.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal totalIncome = BigDecimal.ZERO;
+ for (AccountDto2 item : accountIncomes) {
+ if (item.getAccount() != null) {
+ totalIncome = totalIncome.add(item.getAccount());
+ }
+ }
accountDto.setTotalIncome(totalIncome);
- accountIncomes.stream().forEach(accountDto2 -> {
- accountDto2.setProportion(accountDto2.getAccount().divide(totalIncome,2,BigDecimal.ROUND_HALF_UP));
- });
+ if (totalIncome.compareTo(BigDecimal.ZERO) != 0) {
+ for (AccountDto2 item : accountIncomes) {
+ if (item.getAccount() != null) {
+ item.setProportion(item.getAccount().divide(totalIncome, 2, RoundingMode.HALF_UP));
+ }
+ }
+ } else {
+ for (AccountDto2 item : accountIncomes) {
+ item.setProportion(BigDecimal.ZERO);
+ }
+ }
accountDto.setIncomeType(accountIncomes);
- //鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敮鍑�
- List<AccountDto2> accountExpenses =accountExpenseMapper.report(dateQueryDto);
- accountDto.setExpenseType(accountExpenses);
+ // 鑾峰彇璇ユ鏃堕棿鍐呯殑鎵�鏈夋敮鍑�
+ List<AccountDto2> accountExpenses = accountExpenseMapper.report(dateQueryDto);
+ if (accountExpenses == null) {
+ accountExpenses = Collections.emptyList();
+ }
+
+ accountDto.setExpenseType(accountExpenses); // 绉婚櫎浜嗕笅鏂归噸澶嶇殑涓�琛�
+
Long expenseNumber = accountExpenseMapper.selectCount(Wrappers.<AccountExpense>lambdaQuery()
.between(AccountExpense::getExpenseDate, dateQueryDto.getEntryDateStart(), dateQueryDto.getEntryDateEnd()));
accountDto.setExpenseNumber(expenseNumber);
- BigDecimal totalExpense = accountExpenses.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ BigDecimal totalExpense = BigDecimal.ZERO;
+ for (AccountDto2 item : accountExpenses) {
+ if (item.getAccount() != null) {
+ totalExpense = totalExpense.add(item.getAccount());
+ }
+ }
accountDto.setTotalExpense(totalExpense);
- accountExpenses.stream().forEach(accountDto2 -> {
- accountDto2.setProportion(accountDto2.getAccount().divide(totalExpense,2,BigDecimal.ROUND_HALF_UP));
- });
+
+ if (totalExpense.compareTo(BigDecimal.ZERO) != 0) {
+ for (AccountDto2 item : accountExpenses) {
+ if (item.getAccount() != null) {
+ item.setProportion(item.getAccount().divide(totalExpense, 2, RoundingMode.HALF_UP));
+ }
+ }
+ } else {
+ for (AccountDto2 item : accountExpenses) {
+ item.setProportion(BigDecimal.ZERO);
+ }
+ }
accountDto.setExpenseType(accountExpenses);
- //鍑�鏀跺叆
+
+ // 鍑�鏀跺叆
BigDecimal netRevenue = totalIncome.subtract(totalExpense);
accountDto.setNetRevenue(netRevenue);
return accountDto;
@@ -115,35 +155,44 @@
@Override
public Map<String, List<String>> analysis() {
- // 鑾峰彇鏈懆鐨勬椂闂磋寖鍥�
- LocalDate startOfWeek = LocalDate.now().with(DayOfWeek.MONDAY);
- LocalDate endOfWeek = LocalDate.now().with(DayOfWeek.SUNDAY);
+ // 缁熻鏈�杩�12涓湀鐨勬暟鎹�
+ LocalDate today = LocalDate.now();
Map<String, List<String>> result = new HashMap<>();
- List<String> days = new ArrayList<>();
+ List<String> months = new ArrayList<>();
List<String> totalIncomeList = new ArrayList<>();
List<String> totalExpenseList = new ArrayList<>();
List<String> netIncomeList = new ArrayList<>();
- // 鏍规嵁鏃堕棿鑼冨洿寰幆鏌ヨ姣忎竴澶╃殑鎬绘敹鍏ワ紝鎬绘敮鍑�,鍑�鏀跺叆锛堟�绘敹鍏�-鎬绘敮鍑猴級
- for (LocalDate date = startOfWeek; date.isBefore(endOfWeek) || date.isEqual(endOfWeek); date = date.plusDays(1)) {
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+
+ // 浠庡綋鍓嶆湀浠藉線鍓嶆帹12涓湀
+ for (int i = 0; i < 12; i++) {
+ LocalDate monthDate = today.minusMonths(i);
+ LocalDate startOfMonth = monthDate.withDayOfMonth(1);
+ LocalDate endOfMonth = monthDate.withDayOfMonth(monthDate.lengthOfMonth());
+
+ // 鏌ヨ璇ユ湀鐨勬�绘敹鍏�
BigDecimal totalIncome = accountIncomeMapper.selectList(Wrappers.<AccountIncome>lambdaQuery()
- .eq(AccountIncome::getInputTime, date.toString()))
+ .between(AccountIncome::getInputTime, startOfMonth.toString(), endOfMonth.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()))
+ .between(AccountExpense::getInputTime, startOfMonth.toString(), endOfMonth.toString()))
.stream()
.map(AccountExpense::getExpenseMoney)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
+
BigDecimal netIncome = totalIncome.subtract(totalExpense);
- days.add(date.toString());
+ months.add(monthDate.format(formatter));
totalIncomeList.add(totalIncome.toString());
totalExpenseList.add(totalExpense.toString());
netIncomeList.add(netIncome.toString());
}
- result.put("days", days); // 澶�
+ result.put("months", months); // 鏈堜唤
result.put("totalIncome", totalIncomeList); // 鏀跺叆
result.put("totalExpense", totalExpenseList); // 鏀嚭
result.put("netIncome", netIncomeList); // 鍑�鏀跺叆
--
Gitblit v1.9.3