diff --git a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java index 1352815..6455718 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -232,6 +232,10 @@ public class ProcessController { return processService.getProjectRepaidAmount(id); } + private BigDecimal getContractAmount(int id) { + return processService.getContractAmount(id); + } + /** * 搜索符合条件的项目,供给选择 */ @@ -313,6 +317,8 @@ public class ProcessController { // project_budget_plan_detail 垫资金额计算 BigDecimal repaidAmount = getRepaidAmount(id); + BigDecimal contractAmount = getContractAmount(id); + List procurementDetails = Collections.emptyList(); List incomeDetails = Collections.emptyList(); if (processType == ProcessType.sale_contract) { @@ -334,7 +340,7 @@ public class ProcessController { .budgetGrossMargin(budgetBean.getProjectGrossProfitRate()) .projectNo(project.getProjectNo()) .applyPersonName(admin.getRealName()) - .contractAmount(project.getContractAmount()) + .contractAmount(contractAmount) .terminalCustomer(project.getTerminalCustomer()) .projectType(Enumerable.of(ProjectType.class, project.getType()).getDescription()) .cooperationType(Enumerable.of(CooperationType.class, project.getCooperateType()).getDescription()) diff --git a/src/main/java/cn/palmte/work/service/ProjectProcessService.java b/src/main/java/cn/palmte/work/service/ProjectProcessService.java index 803bbea..23b05e6 100644 --- a/src/main/java/cn/palmte/work/service/ProjectProcessService.java +++ b/src/main/java/cn/palmte/work/service/ProjectProcessService.java @@ -108,6 +108,12 @@ public class ProjectProcessService { return queryProject.getProcessType() == ProcessType.sale_contract; } + public BigDecimal getContractAmount(int id) { + Map map = jdbcTemplate.queryForMap( + "select ifnull(sum(amount * price), 0) contractAmount from project_budget_income_detail where project_id = ?", id); + return (BigDecimal) map.values().iterator().next(); + } + @Data static class DeptReturnValue {