From 35a2135d5800e2c6bad631993d06cf1e37e9cd49 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Thu, 21 Jul 2022 14:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=87=91=E9=A2=9D0.00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 9014abc..a89ed4b 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -181,6 +181,7 @@ public class ProjectService {
 
         //只有如下可以修改
         projectInDb.setName(project.getName());
+        projectInDb.setProjectNo(project.getProjectNo());
         projectInDb.setCustomer(project.getCustomer());
         projectInDb.setTerminalCustomer(project.getTerminalCustomer());
         projectInDb.setIndustryScenario(project.getIndustryScenario());
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index e19bd5f..cfd99d5 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -200,9 +200,9 @@
                                 <td>${list.projectNo!}</td>
                                 <td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
                                 <td>${list.typeDesc!}</td>
-                                <td>${list.contractAmount!}</td>
-                                <td>${list.huazhiProductAmount!}</td>
-                                <td>${list.ziguangOtherAmount!}</td>
+                                <td>${Utils.format(list.contractAmount, "0.00")}</td>
+                                <td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
+                                <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
                                 <td>${list.statusDesc!}</td>
                                 <td>${list.approveStatusDesc!}</td>
                                 <td>${list.approveName!}</td>