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 | 29 +++++++++++++++++++----------
1 files changed, 19 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 446efca..feb6522 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java
@@ -155,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