From 2d41cdddfc50bc89cde15b33f42e1cbbb7cd157a Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 16 Aug 2022 16:56:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/service/ProjectBudgetService.java | 2 +- .../java/cn/palmte/work/service/ProjectEstimateService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java index 1b02e85..7e621ae 100644 --- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java +++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java @@ -795,7 +795,7 @@ public class ProjectBudgetService { */ @Transactional(rollbackFor = RuntimeException.class) public Project budgetEditSave(Project project, Project projectInDb, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) { - Project p = projectService.estimateEditProject(project, projectInDb); + Project p = projectService.editProject(project, projectInDb); p.setStatus(StatusEnum.BUDGET_ACCOUNTS.getStatus()); p.setStatusDesc(StatusEnum.BUDGET_ACCOUNTS.getStatusDesc()); p.setApproveStatusBudget(approveStatusEnum.getApproveStatus()); diff --git a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java index 0c24a1d..f8f359a 100644 --- a/src/main/java/cn/palmte/work/service/ProjectEstimateService.java +++ b/src/main/java/cn/palmte/work/service/ProjectEstimateService.java @@ -327,7 +327,7 @@ public class ProjectEstimateService { */ @Transactional(rollbackFor = RuntimeException.class) public Project estimateEditSave(Project project, Project projectInDb, EstimateBean estimateBean, Admin admin, ApproveStatusEnum approveStatusEnum) { - Project p = projectService.editProject(project, projectInDb); + Project p = projectService.estimateEditProject(project, projectInDb); p.setStatus(StatusEnum.ESTIMATE_ACCOUNTS.getStatus()); p.setStatusDesc(StatusEnum.ESTIMATE_ACCOUNTS.getStatusDesc()); p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus());