From f25c4c67594944391d49676d58a643dfbf9b242c Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 22 Jul 2022 10:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=A1=E6=89=B9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/controller/backend/ProjectController.java | 1 +
 .../resources/templates/admin/project_list_approve.ftl    | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
index 5910036..dec68cd 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -369,6 +369,7 @@ public class ProjectController extends BaseController {
         model.put("deptList", deptService.findAll());
         ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
         model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize));
+        model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
         return "admin/project_list_approve";
     }
 
diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl
index cc875ff..935bddc 100644
--- a/src/main/resources/templates/admin/project_list_approve.ftl
+++ b/src/main/resources/templates/admin/project_list_approve.ftl
@@ -174,8 +174,12 @@
                         <thead>
                         <tr class="am-text-nowrap">
                             <th class="table-title">序号</th>
+                            <th class="table-title">项目编号</th>
                             <th class="table-title">项目名称</th>
                             <th class="table-title">项目类型</th>
+                            <th class="table-title">项目合同金额</th>
+                            <th class="table-title">华智产品金额</th>
+                            <th class="table-title">其他产品金额</th>
                             <th class="table-title">项目状态</th>
                             <th class="table-title">审核状态</th>
                             <th class="table-title">当前审核人</th>
@@ -190,8 +194,12 @@
                         <#list    pager.list as list>
                             <tr>
                                 <td>${list.id!}</td>
+                                <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>${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>