From 9ed0de19e4a2c1eebba2b6c7a8e14a4ab281cf87 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Tue, 16 Aug 2022 11:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9B=E7=AE=97=E9=A2=84=E7=AE=97=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B9=E7=9B=AE=E5=85=B6=E4=BB=96=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/admin/project_approve.ftl        | 18 +++++++++---------
 .../resources/templates/admin/project_list.ftl |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/templates/admin/project_approve.ftl b/src/main/resources/templates/admin/project_approve.ftl
index 08f41e0..70bc7c1 100644
--- a/src/main/resources/templates/admin/project_approve.ftl
+++ b/src/main/resources/templates/admin/project_approve.ftl
@@ -139,7 +139,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red">*</span><input readonly style="text-align: right;width: 69px; margin-bottom: 13px;" value="部门名称"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${project.deptName}"></input>
+                                    <input readonly value="${project.deptName!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -159,7 +159,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.name}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.name}">
+                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.name!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -183,7 +183,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划开始时间"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${project.startDate?string("yyyy-MM-dd")}"></input>
+                                    <input readonly value="${(project.startDate?string("yyyy-MM-dd"))!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -191,7 +191,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 134px ;margin-bottom: 6px;" value="项目计划结束时间"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${project.endDate?string("yyyy-MM-dd")}"></input>
+                                    <input readonly value="${(project.endDate?string("yyyy-MM-dd"))!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -254,7 +254,7 @@
                             <div class="am-g am-form-group am-margin-top">
                                 <div class="am-u-sm-4 am-u-md-2 am-text-right"><span style="color: red;">*</span><input readonly style="text-align: right;width: 100px;margin-bottom: 12px;" value="行业场景应用"></div>
                                 <div class="am-u-sm-6 am-u-md-6">
-                                    <input readonly value="${project.industryScenario}"></input>
+                                    <input readonly value="${project.industryScenario!}"></input>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -264,7 +264,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                    <#-- <textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.customer}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.customer}">
+                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.customer!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -274,7 +274,7 @@
                                 <div class="am-u-sm-6 am-u-md-6">
                                     <#--<textarea style="overflow:auto; background-attachment: fixed;
                                     background-repeat: no-repeat; border-style: solid;border-color: #FFFFFF">${project.terminalCustomer}</textarea>-->
-                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.terminalCustomer}">
+                                    <input readonly type="text" style="word-break: break-word; border:0 none;outline:none;" value="${project.terminalCustomer!}">
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                             </div>
@@ -385,7 +385,7 @@
                                 <div class="am-u-sm-2 am-u-md-2">
                                     <div class="am-form-group am-form-icon">
                                         <i class="am-icon-calendar"></i>
-                                        <input readonly value="${project.contractTime?string("yyyy-MM-dd")}">
+                                        <input readonly value="${(project.contractTime?string("yyyy-MM-dd"))!}">
                                     </div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -395,7 +395,7 @@
                                 <div class="am-u-sm-2 am-u-md-2">
                                     <div class="am-form-group am-form-icon">
                                         <i class="am-icon-calendar"></i>
-                                        <input readonly value="${project.bidsTime?string("yyyy-MM-dd")}">
+                                        <input readonly value="${(project.bidsTime?string("yyyy-MM-dd"))!}">
                                     </div>
                                 </div>
                                 <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl
index 46f4669..9f0bcd5 100644
--- a/src/main/resources/templates/admin/project_list.ftl
+++ b/src/main/resources/templates/admin/project_list.ftl
@@ -329,7 +329,7 @@
                                 <td>${Utils.format(list.huasanProductAmount, "0.00")}</td>
                                 <td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
                                 <td>${list.statusDesc!}</td>
-                                <td>${list.underwrittenModeDesc!}</td>
+                                <td>${list.underwrittenModeStr!}</td>
                                 <td>${list.collaborator!}</td>
                                 <td>${list.certaintyStr!}</td>
                                 <td>${list.industryScenario!}</td>