mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_2.0.1' of http://git.unissense.tech/mula/fourcal into dev_2.0.1

dev_2.0.2
‘wangjiuyun 2024-11-29 16:03:05 +08:00
parent c2599b40bf 60c9576cdd
commit a884037ae5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/cn/palmte/work/service/ProjectBudgetService.java
View File

@ -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;