From d11678aa3c03a14f2e42469df60930b80fd97337 Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Mon, 26 Dec 2022 10:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E4=BE=8B=E9=87=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/cn/palmte/work/pojo/ActProcIns.java           | 1 +
 src/main/java/cn/palmte/work/service/ActProcInsService.java | 5 +++--
 src/main/resources/templates/admin/act_proc_ins_list.ftl    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cn/palmte/work/pojo/ActProcIns.java b/src/main/java/cn/palmte/work/pojo/ActProcIns.java
index ed51adf..70dce81 100644
--- a/src/main/java/cn/palmte/work/pojo/ActProcIns.java
+++ b/src/main/java/cn/palmte/work/pojo/ActProcIns.java
@@ -21,4 +21,5 @@ public class ActProcIns {
     private Date endTime;
 
     private String projectName;
+    private String projectTitle;
 }
diff --git a/src/main/java/cn/palmte/work/service/ActProcInsService.java b/src/main/java/cn/palmte/work/service/ActProcInsService.java
index 7075250..29b0983 100644
--- a/src/main/java/cn/palmte/work/service/ActProcInsService.java
+++ b/src/main/java/cn/palmte/work/service/ActProcInsService.java
@@ -166,11 +166,12 @@ public class ActProcInsService {
                 "h.start_time_ as startTime,h.end_time_ as endTime,p.key_ as procKey," +
                 "p.name_ as procName,p.NAME_  as dgrmResourceName,p.version_ as version," +
                 " GROUP_CONCAT(t.NAME_) as currentTask, GROUP_CONCAT(t.ID_) as currentTaskId," +
-                " pjct.name as projectName";
+                " pjct.name as projectName,pp.project_title  AS projectTitle";
         QueryHelper queryHelper = new QueryHelper(select, " act_hi_procinst h " +
                 "left join ACT_RE_PROCDEF p on h.PROC_DEF_ID_ =p.ID_ " +
                 "LEFT JOIN act_ru_task t on t.PROC_INST_ID_=h.proc_inst_id_ " +
-                "LEFT JOIN project pjct on pjct.id=h.BUSINESS_KEY_");
+                "LEFT JOIN project pjct on pjct.id=h.BUSINESS_KEY_ " +
+                "LEFT JOIN project_process pp on pp.id=h.BUSINESS_KEY_ ");
         queryHelper.addGroupProperty("h.PROC_INST_ID_");
         queryHelper.addOrderProperty("h.start_time_", false);
         Page<ActProcIns> paginate = pagination.paginate(queryHelper.getSql(), ActProcIns.class, pageNumber, pageSize);
diff --git a/src/main/resources/templates/admin/act_proc_ins_list.ftl b/src/main/resources/templates/admin/act_proc_ins_list.ftl
index 829046b..ba51f35 100644
--- a/src/main/resources/templates/admin/act_proc_ins_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl
@@ -35,7 +35,7 @@
                                 <td>${list.procName!}</td>
                                 <td>${list.procKey!}</td>
                                 <td>${list.version!}</td>
-                                <td>${list.projectName!}</td>
+                                <td>${list.projectName!}${list.projectTitle!}</td>
                                 <td>${list.user!}</td>
                                 <td>${list.startTime?datetime}</td>
                                 <td>${list.currentTask!}</td>