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

项目提交审核之后再保存预算列表和导出金额

master
OathK1per 2023-02-09 18:43:26 +08:00
parent 0616069aea
commit 7c9f0d8f66
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -872,6 +872,8 @@ public class ProjectBudgetService {
budgetEditSave(project, projectInDb, budgetBean, admin, ApproveStatusEnum.APPROVAL_PENDING, projectBudget); budgetEditSave(project, projectInDb, budgetBean, admin, ApproveStatusEnum.APPROVAL_PENDING, projectBudget);
saveProjectExtend(projectInDb);
budgetApprove(approveStatusBudget, projectInDb, admin); budgetApprove(approveStatusBudget, projectInDb, admin);
} }
@ -926,7 +928,6 @@ public class ProjectBudgetService {
clearBudgetDetail(p); clearBudgetDetail(p);
saveBudgetDetail(p); saveBudgetDetail(p);
saveProjectExtend(p);
return p; return p;
} }
@ -959,26 +960,32 @@ public class ProjectBudgetService {
extend.setAdvancePeakAmount(bean.getAmount()); extend.setAdvancePeakAmount(bean.getAmount());
BudgetBean budgetBean = projectBudgetService.getBudget(p); BudgetBean budgetBean = projectBudgetService.getBudget(p);
extend.setGrossProfit(budgetBean.getProjectGrossProfit()); BigDecimal grossProfit = budgetBean.getProjectGrossProfit();
extend.setGrossProfitMargin(budgetBean.getProjectGrossProfitRate()); if (grossProfit != null) {
extend.setGrossProfit(grossProfit);
extend.setGrossProfitMargin(budgetBean.getProjectGrossProfitRate());
}
List<ProjectBudgetIncomeDetail> projectBudgetIncomeDetails = projectBudgetIncomeDetailRepository.findAllByProjectIdEquals(p.getId()); List<ProjectBudgetIncomeDetail> projectBudgetIncomeDetails = projectBudgetIncomeDetailRepository.findAllByProjectIdEquals(p.getId());
BigDecimal contractAmount = projectBudgetIncomeDetails.stream().map(ProjectBudgetIncomeDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); if (projectBudgetIncomeDetails.size() > 0) {
extend.setContractAmount(contractAmount); BigDecimal contractAmount = projectBudgetIncomeDetails.stream().map(ProjectBudgetIncomeDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add);
extend.setContractAmount(contractAmount);
}
List<ProjectBudgetCostDetail> projectBudgetCostDetails = projectBudgetCostDetailRepository.findAllByProjectIdEquals(p.getId()); List<ProjectBudgetCostDetail> projectBudgetCostDetails = projectBudgetCostDetailRepository.findAllByProjectIdEquals(p.getId());
if (projectBudgetCostDetails.size() > 0) {
ProcurementType huizhiType = procurementTypeRepository.findByName("汇智产品"); ProcurementType huizhiType = procurementTypeRepository.findByName("汇智产品");
BigDecimal huizhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huizhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); BigDecimal huizhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huizhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add);
extend.setHuizhiProductAmount(huizhi); extend.setHuizhiProductAmount(huizhi);
ProcurementType huazhiType = procurementTypeRepository.findByName("华智产品"); ProcurementType huazhiType = procurementTypeRepository.findByName("华智产品");
BigDecimal huazhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huazhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); BigDecimal huazhi = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huazhiType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add);
extend.setHuazhiProductAmount(huazhi); extend.setHuazhiProductAmount(huazhi);
ProcurementType huasanType = procurementTypeRepository.findByName("华三产品"); ProcurementType huasanType = procurementTypeRepository.findByName("华三产品");
BigDecimal huasan = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add); BigDecimal huasan = projectBudgetCostDetails.stream().filter(a -> a.getCategory() == huasanType.getId()).map(ProjectBudgetCostDetail::getTotalTaxInclude).reduce(new BigDecimal(0), BigDecimal::add);
extend.setHuasanProductAmount(huasan); 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); 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); extend.setZiguangOtherAmount(other);
}
projectExtendRepository.save(extend); projectExtendRepository.save(extend);
} }

4
src/main/java/cn/palmte/work/service/ProjectEstimateService.java
View File

@ -282,7 +282,7 @@ public class ProjectEstimateService {
Project p = projectService.addProject(project, admin, approveStatusEnum); Project p = projectService.addProject(project, admin, approveStatusEnum);
saveEstimate(p, estimateBean); saveEstimate(p, estimateBean);
saveProjectExtend(p); // saveProjectExtend(p);
return p; return p;
} }
/** /**
@ -400,7 +400,7 @@ public class ProjectEstimateService {
clearEstimate(p); clearEstimate(p);
saveEstimate(p, estimateBean); saveEstimate(p, estimateBean);
saveProjectExtend(p); // saveProjectExtend(p);
return p; return p;
} }