From 7c9f0d8f664e11b99a8de2d9bde0ec818cdb47e3 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Thu, 9 Feb 2023 18:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=90=E4=BA=A4=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E4=B9=8B=E5=90=8E=E5=86=8D=E4=BF=9D=E5=AD=98=E9=A2=84?= =?UTF-8?q?=E7=AE=97=E5=88=97=E8=A1=A8=E5=92=8C=E5=AF=BC=E5=87=BA=E9=87=91?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectBudgetService.java | 41 +++++++++++-------- .../work/service/ProjectEstimateService.java | 4 +- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 0c2c02b..02ced7e 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -872,6 +872,8 @@ public class ProjectBudgetService { budgetEditSave(project, projectInDb, budgetBean, admin, ApproveStatusEnum.APPROVAL_PENDING, projectBudget); + saveProjectExtend(projectInDb); + budgetApprove(approveStatusBudget, projectInDb, admin); } @@ -926,7 +928,6 @@ public class ProjectBudgetService { clearBudgetDetail(p); saveBudgetDetail(p); - saveProjectExtend(p); return p; } @@ -959,26 +960,32 @@ public class ProjectBudgetService { extend.setAdvancePeakAmount(bean.getAmount()); BudgetBean budgetBean = projectBudgetService.getBudget(p); - extend.setGrossProfit(budgetBean.getProjectGrossProfit()); - extend.setGrossProfitMargin(budgetBean.getProjectGrossProfitRate()); + BigDecimal grossProfit = budgetBean.getProjectGrossProfit(); + if (grossProfit != null) { + extend.setGrossProfit(grossProfit); + extend.setGrossProfitMargin(budgetBean.getProjectGrossProfitRate()); + } List projectBudgetIncomeDetails = projectBudgetIncomeDetailRepository.findAllByProjectIdEquals(p.getId()); - BigDecimal contractAmount = projectBudgetIncomeDetails.stream().map(ProjectBudgetIncomeDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); - extend.setContractAmount(contractAmount); + if (projectBudgetIncomeDetails.size() > 0) { + BigDecimal contractAmount = projectBudgetIncomeDetails.stream().map(ProjectBudgetIncomeDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); + extend.setContractAmount(contractAmount); + } List projectBudgetCostDetails = projectBudgetCostDetailRepository.findAllByProjectIdEquals(p.getId()); - - ProcurementType huizhiType = procurementTypeRepository.findByName("汇智产品"); - BigDecimal huizhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huizhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); - extend.setHuizhiProductAmount(huizhi); - ProcurementType huazhiType = procurementTypeRepository.findByName("华智产品"); - BigDecimal huazhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huazhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); - extend.setHuazhiProductAmount(huazhi); - ProcurementType huasanType = procurementTypeRepository.findByName("华三产品"); - BigDecimal huasan = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); - extend.setHuasanProductAmount(huasan); - BigDecimal other = projectBudgetCostDetails.stream().filter(a -> a.getCategory() != huizhiType.getId() && a.getCategory() != huazhiType.getId() && a.getCategory() != huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); - extend.setZiguangOtherAmount(other); + if (projectBudgetCostDetails.size() > 0) { + ProcurementType huizhiType = procurementTypeRepository.findByName("汇智产品"); + BigDecimal huizhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huizhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); + extend.setHuizhiProductAmount(huizhi); + ProcurementType huazhiType = procurementTypeRepository.findByName("华智产品"); + BigDecimal huazhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huazhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); + extend.setHuazhiProductAmount(huazhi); + ProcurementType huasanType = procurementTypeRepository.findByName("华三产品"); + BigDecimal huasan = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); + extend.setHuasanProductAmount(huasan); + BigDecimal other = projectBudgetCostDetails.stream().filter(a -> a.getCategory() != huizhiType.getId() && a.getCategory() != huazhiType.getId() && a.getCategory() != huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); + extend.setZiguangOtherAmount(other); + } projectExtendRepository.save(extend); } diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 8bdf294..60a9ffc 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -282,7 +282,7 @@ public class ProjectEstimateService { Project p = projectService.addProject(project, admin, approveStatusEnum); saveEstimate(p, estimateBean); - saveProjectExtend(p); +// saveProjectExtend(p); return p; } /** @@ -400,7 +400,7 @@ public class ProjectEstimateService { clearEstimate(p); saveEstimate(p, estimateBean); - saveProjectExtend(p); +// saveProjectExtend(p); return p; }