diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java index 4e40581..43e4efd 100644 --- a/src/main/java/cn/palmte/work/service/ProjectService.java +++ b/src/main/java/cn/palmte/work/service/ProjectService.java @@ -101,6 +101,8 @@ public class ProjectService { @Transactional(rollbackFor = RuntimeException.class) public Project estimateEditSave(Project project, EstimateBean estimateBean, Admin admin, ApproveStatusEnum approveStatusEnum) { Project p = editProject(project, admin, approveStatusEnum); + p.setStatus(StatusEnum.CREATED.getStatus()); + p.setStatusDesc(StatusEnum.CREATED.getStatusDesc()); p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); p = projectRepository.saveAndFlush(p); //清空重新保存概算信息 @@ -153,6 +155,8 @@ public class ProjectService { @Transactional(rollbackFor = RuntimeException.class) public Project budgetEditSave(Project project, BudgetBean budgetBean, Admin admin, ApproveStatusEnum approveStatusEnum) { Project p = editProject(project, admin, approveStatusEnum); + p.setStatus(StatusEnum.BUDGET_ACCOUNTS.getStatus()); + p.setStatusDesc(StatusEnum.BUDGET_ACCOUNTS.getStatusDesc()); p.setApproveStatusEstimate(approveStatusEnum.getApproveStatus()); p = projectRepository.saveAndFlush(p); //清空重新保存概算信息 diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl index dd7c148..0061c1d 100644 --- a/src/main/resources/templates/admin/project_budget_edit.ftl +++ b/src/main/resources/templates/admin/project_budget_edit.ftl @@ -321,6 +321,7 @@ 现金流量表 + 资金计划表