From 60c9576cdd2c7d9f26039e43366ca2a4d9385630 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Fri, 29 Nov 2024 15:55:40 +0800
Subject: [PATCH] =?UTF-8?q?refactor(ProjectBudgetService):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=94=80=E5=94=AE=E6=94=B6=E7=9B=8A=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将`calSaleIncome`方法的参数从`List<ProjectBudgetIncomeDetail>`更改为`List<ProjectBudgetPlanDetail>`，并相应地调整了方法内部的逻辑。具体来说，将循环中的对象从`ProjectBudgetIncomeDetail`变更为`ProjectBudgetPlanDetail`，并且获取销售收益的方式也由`getTotalTaxInclude()`变更为`getSaleIncome()`。此外，在调用`calSaleIncome`的地方，传入的参数也做了相应的更新。
---
 .../cn/palmte/work/service/ProjectBudgetService.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index 6d49b46..3a928e6 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -789,7 +789,7 @@ public class ProjectBudgetService {
         BigDecimal engineerCost = calEngineerCost(budgetCostDetail);
         BigDecimal projectManageCost = calProjectManageCost(budgetCostProjectManageDetail);
 
-        BigDecimal saleIncome = calSaleIncome(budgetIncomeDetail);
+        BigDecimal saleIncome = calSaleIncome(projectBudgetPlanDetails);
 
         BigDecimal earnestMoneyIncome = new BigDecimal(0);
         BigDecimal earnestMoneyCost = new BigDecimal(0);
@@ -838,11 +838,11 @@ public class ProjectBudgetService {
         return projectBudgetPlanDetail;
     }
 
-    private BigDecimal calSaleIncome(List<ProjectBudgetIncomeDetail> budgetIncomeDetail) {
+    private BigDecimal calSaleIncome( List<ProjectBudgetPlanDetail> projectBudgetPlanDetails) {
         BigDecimal saleIncome = new BigDecimal(0);
-        if(CollectionUtil.isNotEmpty(budgetIncomeDetail)){
-            for (ProjectBudgetIncomeDetail projectBudgetIncomeDetail : budgetIncomeDetail) {
-                saleIncome = saleIncome.add(projectBudgetIncomeDetail.getTotalTaxInclude());
+        if(CollectionUtil.isNotEmpty(projectBudgetPlanDetails)){
+            for (ProjectBudgetPlanDetail detail : projectBudgetPlanDetails) {
+                saleIncome = saleIncome.add(detail.getSaleIncome());
             }
         }
         return saleIncome;