From 60400bd8f4ba3d9e733b1a45d0ad614d86727fa9 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 16 Dec 2022 10:55:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A2=84=E7=AE=97=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=A6=82=E7=AE=97=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_budget_edit.ftl   | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/src/main/resources/templates/admin/project_budget_edit.ftl b/src/main/resources/templates/admin/project_budget_edit.ftl
index 9be0f6d..70a8803 100644
--- a/src/main/resources/templates/admin/project_budget_edit.ftl
+++ b/src/main/resources/templates/admin/project_budget_edit.ftl
@@ -322,6 +322,43 @@
                                     >${project.calculationCollection!}</textarea>
                             </td>
                         </tr>
+                        <tr class="am-text-nowrap">
+                            <th class="table-title" colspan="1" ><span style="font-size: 15px">项目阶段:</span></th>
+                            <td class="table-title" colspan="5" >
+                                <#if project.stage??>
+                                    <#if (project.stage) =0>
+                                        <input readonly value="S0-概算立项"/>
+                                    <#elseif (project.stage) =1>
+                                        <input readonly value="S1-项目调研"/>
+                                    <#elseif (project.stage) =2>
+                                        <input readonly value="S2-方案设计"/>
+                                    <#elseif (project.stage) =3>
+                                        <input readonly value="S3-预算评估"/>
+                                    <#elseif (project.stage) =4>
+                                        <input readonly value="S4-招标期"/>
+                                    <#elseif (project.stage) =5>
+                                        <input readonly value="S5-合同期"/>
+                                    <#elseif (project.stage) =6>
+                                        <input readonly value="S6-交付期"/>
+                                    <#elseif (project.stage) =7>
+                                        <input readonly value="S7-结算期"/>
+                                    <#elseif (project.stage) =8>
+                                        <input readonly value="S8-决算期"/>
+                                    <#elseif (project.stage) =9>
+                                        <input readonly value="L-项目丢失"/>
+                                    </#if>
+                                <#else>
+                                    <input readonly value=""/>
+                                </#if>
+                            </td>
+                        </tr>
+                        <tr class="am-text-nowrap">
+                            <th class="table-title" colspan="1" ><span style="font-size: 15px">当前进度描述:</span></th>
+                            <td class="table-title" colspan="5" >
+                                    <textarea rows="3" cols="20" style="border-style:none;background-color: white;" disabled="disabled"
+                                    >${project.stageRemark!}</textarea>
+                            </td>
+                        </tr>
                     </table>
                 </div>
                 <div class="am-tab-panel am-fade am-in am-active" id="tab2">

From 8a45e064c7967510da4c9ecbf52af7e2494f5b8a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 16 Dec 2022 17:42:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?is=5Fbudget=E5=AD=97=E6=AE=B5=E9=9C=80?=
 =?UTF-8?q?=E4=BF=9D=E6=8C=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/service/ProjectBudgetService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
index b8f981e..5fa5972 100644
--- a/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectBudgetService.java
@@ -950,8 +950,9 @@ public class ProjectBudgetService {
         if (extend == null) {
             extend = new ProjectExtend();
             extend.setProjectId(p.getId());
-            extend.setIsBudget(1);
         }
+        extend.setIsBudget(1);
+
         List<ProjectBudgetPlanDetail> projectBudgetPlanDetails = projectBudgetService.getProjectBudgetPlanDetails(p);
         ProjectUnderwrittenPlanStatisticBean bean = projectBudgetService.getProjectUnderwrittenPlanStatisticBean(projectBudgetPlanDetails);
         extend.setAdvanceInterestAmount(bean.getCapitalInterest());