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 27s
Details
Docker Build & Deploy / Deploy to Production (push) Successful in 10s
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-15 20:50:14 +08:00
parent 12b8e4bd0e
commit 0e140548b7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Service/BudgetService.cs
View File

@@ -602,9 +602,9 @@ public class BudgetService(
}
description.Append($"<p>收入合计: <span class='income-value'><strong>{incomeLimitAtPeriod:N0}</strong></span></p>");
description.Append("<h3>不记额收入明细</h3>");
if (noLimitIncomeItems.Count > 0)
if (periodType == BudgetPeriodType.Year && noLimitIncomeItems.Count > 0)
{
description.Append("<h3>不记额收入明细</h3>");
description.Append("""
<table>
<thead>
@@ -625,8 +625,8 @@ public class BudgetService(
""");
}
description.Append("</tbody></table>");
description.Append($"<p>不记额收入合计: <span class='income-value'><strong>{noLimitIncomeAtPeriod:N0}</strong></span></p>");
}
description.Append($"<p>不记额收入合计: <span class='income-value'><strong>{noLimitIncomeAtPeriod:N0}</strong></span></p>");
description.Append("<h3>预算支出明细</h3>");
if (expenseItems.Count == 0) description.Append("<p>无支出预算</p>");
@@ -659,9 +659,8 @@ public class BudgetService(
}
description.Append($"<p>支出合计: <span class='expense-value'><strong>{expenseLimitAtPeriod:N0}</strong></span></p>");
if (noLimitExpenseItems.Count > 0)
if (periodType == BudgetPeriodType.Year && noLimitExpenseItems.Count > 0)
{
description.Append("<h3>不记额支出明细</h3>");
description.Append("""
<table>
@@ -683,10 +682,9 @@ public class BudgetService(
""");
}
description.Append("</tbody></table>");
description.Append($"<p>不记额支出合计: <span class='expense-value'><strong>{noLimitExpenseAtPeriod:N0}</strong></span></p>");
}
description.Append($"<p>不记额支出合计: <span class='expense-value'><strong>{noLimitExpenseAtPeriod:N0}</strong></span></p>");
description.Append("<h3>存款计划结论</h3>");
// 修改计算公式：包含不记额收入和支出
var totalIncome = incomeLimitAtPeriod + noLimitIncomeAtPeriod;