From 1b47962e676093ecbc7b3bceb1bbd4f9a705f9b8 Mon Sep 17 00:00:00 2001
From: pengqiang <pengqiang.it@ciic.com.cn>
Date: Mon, 15 Nov 2021 17:34:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E9=87=8C?=
 =?UTF-8?q?=E7=9A=84=E5=AE=A1=E6=A0=B8=E6=84=8F=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/controller/backend/ProjectController.java  |  2 ++
 src/main/resources/templates/admin/act_task_def.ftl |  8 ++++----
 .../resources/templates/admin/project_detail.ftl    | 13 +++++++------
 3 files changed, 13 insertions(+), 10 deletions(-)

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 4ee29ad..c6db245 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -333,6 +333,8 @@ public class ProjectController extends BaseController {
         model.put("finalBean", new FinalBean());
         //freemarker可以利用的静态方法
         model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
+        List<ProjectTaskRecord> list = projectTaskRecordService.list(id);
+        model.put("taskRecords", list);
         return "admin/project_detail";
     }
 
diff --git a/src/main/resources/templates/admin/act_task_def.ftl b/src/main/resources/templates/admin/act_task_def.ftl
index 3520039..a599a94 100644
--- a/src/main/resources/templates/admin/act_task_def.ftl
+++ b/src/main/resources/templates/admin/act_task_def.ftl
@@ -20,10 +20,10 @@
                         <th class="table-title">任务名称</th>
                         <#--<th class="table-title">任务类型</th>-->
                         <th class="table-date">回退任务</th>
-                        <th class="table-set am-text-center">审批人</th>
-                        <th class="table-set am-text-center">审批角色</th>
-                        <th class="table-set am-text-center">审批通过脚本</th>
-                        <th class="table-set am-text-center">审批驳回脚本</th>
+                        <th class="table-set ">按人员设置审批人</th>
+                        <th class="table-set ">按角色设置审批人</th>
+                        <th class="table-set ">审批通过脚本</th>
+                        <th class="table-set ">审批驳回脚本</th>
                         <th class="table-set am-text-center">操作</th>
                     </tr>
                     </thead>
diff --git a/src/main/resources/templates/admin/project_detail.ftl b/src/main/resources/templates/admin/project_detail.ftl
index 1958af0..980a6dd 100644
--- a/src/main/resources/templates/admin/project_detail.ftl
+++ b/src/main/resources/templates/admin/project_detail.ftl
@@ -1338,13 +1338,14 @@
             <div class="am-tab-panel am-fade am-in am-active" id="tab1">
                 <div class="am-g am-form-group am-margin-top" style="display: flex;">
                     <div class="am-u-sm-4 am-u-md-2 am-text-right">
-                        <span style="color: red;">*</span>审核意见：</div>
-                    <div class="am-u-sm-4 am-u-md-2 am-text-right">
-                        <div class="am-u-sm-6 am-u-md-6">
-                            <span>${project.name}</span>
-                        </div>
+                       审核意见
+                    </div>
+                    <div class="am-u-sm-4 am-u-md-4 am-text-left">
+                        <#list taskRecords as node>
+                            <span>${node.assigneeName} : ${node.taskComment} &nbsp;&nbsp; ${node.createTime}</span>
+                            <hr/>
+                        </#list>
                     </div>
-                    <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
                 </div>
             </div>
         </div>