suncheng/EmailBill
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix
All checks were successful
Docker Build & Deploy / Build Docker Image (push) Successful in 30s
Details
Docker Build & Deploy / Deploy to Production (push) Successful in 12s
Details
Docker Build & Deploy / Cleanup Dangling Images (push) Successful in 1s
Details
Docker Build & Deploy / WeChat Notification (push) Successful in 2s
Details

Browse Source
This commit is contained in:
孙诚
2026-01-07 20:36:58 +08:00
parent aa8fc7a8b3
commit faa5a49553
2 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Web/src/views/BudgetView.vue
View File

@@ -118,11 +118,6 @@
</van-tab> </van-tab>
<van-tab title="存款" :name="BudgetCategory.Savings"> <van-tab title="存款" :name="BudgetCategory.Savings">
<BudgetSummary
:stats="overallStats"
:title="activeTabTitle"
:get-value-class="getValueClass"
/>
<div class="budget-list"> <div class="budget-list">
<template v-if="savingsBudgets?.length > 0"> <template v-if="savingsBudgets?.length > 0">
<van-swipe-cell v-for="budget in savingsBudgets" :key="budget.id"> <van-swipe-cell v-for="budget in savingsBudgets" :key="budget.id">

14
WebApi/Controllers/BudgetController.cs
View File

@@ -169,23 +169,10 @@ public class BudgetController(
decimal incomeLimitAtPeriod = 0; decimal incomeLimitAtPeriod = 0;
decimal expenseLimitAtPeriod = 0; decimal expenseLimitAtPeriod = 0;
var savingsCategories = await configService.GetConfigByKeyAsync<string>("SavingsCategories") ?? string.Empty;
var selectedCategoryList = savingsCategories.Split(',', StringSplitOptions.RemoveEmptyEntries);
foreach (var b in allBudgets) foreach (var b in allBudgets)
{ {
if (b.IsStopped || b.Category == BudgetCategory.Savings) continue; if (b.IsStopped || b.Category == BudgetCategory.Savings) continue;
// 如果设置了存款分类，并且预算有指定分类，则只统计相关的预算
if (selectedCategoryList.Length > 0)
{
var budgetCategories = b.SelectedCategories.Split(',', StringSplitOptions.RemoveEmptyEntries);
if (budgetCategories.Length > 0 && !budgetCategories.Intersect(selectedCategoryList).Any())
{
continue;
}
}
// 折算系数：根据当前请求的 periodType (Year 或 Month)，将预算 b 的 Limit 折算过来 // 折算系数：根据当前请求的 periodType (Year 或 Month)，将预算 b 的 Limit 折算过来
decimal factor = 1.0m; decimal factor = 1.0m;
@@ -218,6 +205,7 @@ public class BudgetController(
else if (b.Category == BudgetCategory.Expense) expenseLimitAtPeriod += b.Limit * factor; else if (b.Category == BudgetCategory.Expense) expenseLimitAtPeriod += b.Limit * factor;
} }
var savingsCategories = await configService.GetConfigByKeyAsync<string>("SavingsCategories") ?? string.Empty;
var virtualBudget = new BudgetRecord var virtualBudget = new BudgetRecord
{ {
Id = periodType == BudgetPeriodType.Year ? -1 : -2, Id = periodType == BudgetPeriodType.Year ? -1 : -2,