From 433928a4446e57ba4daa7f453ae42ae288b48cd2 Mon Sep 17 00:00:00 2001
From: chenhao <852066789@qq.com>
Date: Thu, 26 Dec 2024 09:24:31 +0800
Subject: [PATCH] =?UTF-8?q?feat(project):=20=E6=B7=BB=E5=8A=A0=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在项目审批页面中增加当前任务信息的显示
-通过 actUtil.getCurrentTask 方法获取项目当前任务
- 将当前任务信息添加到 model 中，以便在页面中展示
---
 .../cn/palmte/work/controller/backend/ProjectController.java    | 2 ++
 1 file changed, 2 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 963b642..85ea84f 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java
@@ -818,7 +818,9 @@ public class ProjectController extends BaseController {
                 huiQianFile = first.get().getFileUrl();
             }
             model.put("taskRecords", list);
+//            List<ActHisTask> hisTaskList = actTaskDefService.hisTaskList(list.get(0).getProcInsId());
         }
+        model.put("currentTask", actUtil.getCurrentTask(project.getId()));
         model.put("huiQianFile", huiQianFile);
 
         return "admin/project_approve";