From 088f6fb616b5da2b9b464792e4331b16d0c85c70 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Wed, 4 Jan 2023 17:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=AF=9B=E5=88=A9=E7=8E=87?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=94=99=E8=AF=AF=EF=BC=8C=E5=BA=94=E8=AF=A5?= =?UTF-8?q?=E5=8F=96=E9=A2=84=E7=AE=97=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=88=A9=E6=B6=A6=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palmte/work/controller/backend/ProcessController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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())