From c4928ce07545b10719a3b862c7e9395a7085a7df Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Tue, 2 Nov 2021 17:37:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E6=9B=B4=E6=94=B9=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E9=A2=84=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/service/ProjectService.java   | 4 ++++
 src/main/resources/templates/admin/project_budget_edit.ftl | 1 +
 2 files changed, 5 insertions(+)

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 @@
                 </table>
 
                 <span class="am-text-lg">现金流量表</span>
+                <span class="am-text-primary"><a>资金计划表</a></span>
                 <table class="am-table am-table-bordered am-table-radius table-main" style="padding:0;">
                     <tbody>
                     <tr class="am-text-xl">