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 4b7a758..06c277c 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProcessController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProcessController.java @@ -48,6 +48,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; import cn.palmte.work.ErrorMessageException; +import cn.palmte.work.bean.BudgetBean; import cn.palmte.work.config.activiti.ActApproveTypeEnum; import cn.palmte.work.config.activiti.ActProjectTypeEnum; import cn.palmte.work.model.Admin; @@ -312,6 +313,9 @@ public class ProcessController { else if (processType == ProcessType.procurement_contract) { procurementDetails = processService.getProcurementDetails(id, null); } + + BudgetBean budgetBean = projectBudgetService.getBudget(project); + return ProjectReturnValue.builder() .isPrepaid(isPrepaid(project)) .projectId(project.getId()) @@ -319,7 +323,7 @@ public class ProcessController { .procurementDetails(procurementDetails) .projectName(project.getName()) .repaidAmount(repaidAmount + "元") - .budgetGrossMargin(project.getGrossProfitMargin()) + .budgetGrossMargin(budgetBean.getProjectGrossProfitRate()) .projectNo(project.getProjectNo()) .applyPersonName(admin.getRealName()) .contractAmount(project.getContractAmount())