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 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 @@ 任务名称 <#--任务类型--> 回退任务 - 审批人 - 审批角色 - 审批通过脚本 - 审批驳回脚本 + 按人员设置审批人 + 按角色设置审批人 + 审批通过脚本 + 审批驳回脚本 操作 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 @@
- *审核意见:
-
-
- ${project.name} -
+ 审核意见 +
+
+ <#list taskRecords as node> + ${node.assigneeName} : ${node.taskComment}    ${node.createTime} +
+
-