diff --git a/Service/BudgetService.cs b/Service/BudgetService.cs index 6dc5141..94a0309 100644 --- a/Service/BudgetService.cs +++ b/Service/BudgetService.cs @@ -602,9 +602,9 @@ public class BudgetService( } description.Append($"

收入合计: {incomeLimitAtPeriod:N0}

"); - description.Append("

不记额收入明细

"); - if (noLimitIncomeItems.Count > 0) + if (periodType == BudgetPeriodType.Year && noLimitIncomeItems.Count > 0) { + description.Append("

不记额收入明细

"); description.Append(""" @@ -625,8 +625,8 @@ public class BudgetService( """); } description.Append("
"); + description.Append($"

不记额收入合计: {noLimitIncomeAtPeriod:N0}

"); } - description.Append($"

不记额收入合计: {noLimitIncomeAtPeriod:N0}

"); description.Append("

预算支出明细

"); if (expenseItems.Count == 0) description.Append("

无支出预算

"); @@ -659,9 +659,8 @@ public class BudgetService( } description.Append($"

支出合计: {expenseLimitAtPeriod:N0}

"); - if (noLimitExpenseItems.Count > 0) + if (periodType == BudgetPeriodType.Year && noLimitExpenseItems.Count > 0) { - description.Append("

不记额支出明细

"); description.Append(""" @@ -683,10 +682,9 @@ public class BudgetService( """); } description.Append("
"); + description.Append($"

不记额支出合计: {noLimitExpenseAtPeriod:N0}

"); } - description.Append($"

不记额支出合计: {noLimitExpenseAtPeriod:N0}

"); - description.Append("

存款计划结论

"); // 修改计算公式:包含不记额收入和支出 var totalIncome = incomeLimitAtPeriod + noLimitIncomeAtPeriod;