diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index f471c56..eb88375 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -342,18 +342,25 @@ public class ProjectService { } public void saveApprove(Project project, Admin admin) throws Exception { - if (project.getApproveStatusEstimate() == 0) { + if (project.getApproveStatusEstimate() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { Integer approveStatusEstimate = project.getApproveStatusEstimate(); projectEstimateService.estimateApprove(approveStatusEstimate, project, admin); - } else if (project.getApproveStatusBudget() == 0) { + project.setApproveStatusEstimate(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusBudget() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { Integer approveStatusBudget = project.getApproveStatusBudget(); projectBudgetService.budgetApprove(approveStatusBudget, project, admin); - } else if (project.getApproveStatusSettle() == 0) { + project.setApproveStatusBudget(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusSettle() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { projectInstanceService.startSettleProcessInstance(project, InterfaceUtil.getAdmin()); - } else if (project.getApproveStatusFinal() == 0) { + project.setApproveStatusSettle(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else if (project.getApproveStatusFinal() == ApproveStatusEnum.APPROVAL_UNCOMMIT.getApproveStatus()) { projectInstanceService.startFinalProcessInstance(project.getId(), InterfaceUtil.getAdmin()); + project.setApproveStatusFinal(ApproveStatusEnum.APPROVAL_PENDING.getApproveStatus()); + } else { + return ; } + projectRepository.save(project); } } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 21f5ad0..6c7d33e 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -281,7 +281,7 @@ <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0> @@ -355,6 +355,25 @@