From ef77ff77ea208fc24a36378c23177f2bc6f0bb3d Mon Sep 17 00:00:00 2001
From: pengqiang <1067496116@qq.com>
Date: Mon, 8 Aug 2022 16:16:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=20=20?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AE=9E=E5=88=97=E5=A2=9E=E5=8A=A0=E9=A1=B9?=
=?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0?=
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 +
.../java/cn/palmte/work/service/ActProcInsService.java | 7 +++++--
src/main/resources/templates/admin/act_proc_ins_list.ftl | 4 +++-
3 files changed, 9 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 a6e967f..ed51adf 100644
--- a/src/main/java/cn/palmte/work/pojo/ActProcIns.java
+++ b/src/main/java/cn/palmte/work/pojo/ActProcIns.java
@@ -20,4 +20,5 @@ public class ActProcIns {
private Date endTime;
+ private String projectName;
}
diff --git a/src/main/java/cn/palmte/work/service/ActProcInsService.java b/src/main/java/cn/palmte/work/service/ActProcInsService.java
index 944d33b..f9be3f9 100644
--- a/src/main/java/cn/palmte/work/service/ActProcInsService.java
+++ b/src/main/java/cn/palmte/work/service/ActProcInsService.java
@@ -123,10 +123,13 @@ public class ActProcInsService {
public Page<ActProcIns> list(ConcurrentHashMap<String, String> searchInfo, int pageNumber, int pageSize) {
String select = "select h.proc_inst_id_ as procInsId,h.proc_def_id_ as procDefId," +
"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";
+ "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";
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 act_ru_task t on t.PROC_INST_ID_=h.proc_inst_id_ " +
+ "LEFT JOIN project pjct on pjct.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 7a97184..cb6b3c9 100644
--- a/src/main/resources/templates/admin/act_proc_ins_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl
@@ -19,9 +19,10 @@
<th class="table-title">流程名称</th>
<th class="table-title">流程标识</th>
<th class="table-title">流程版本</th>
+ <th class="table-title">项目名称</th>
<th class="table-date">申请人</th>
<th class="table-date">申请时间</th>
- <th class="table-date">当前任务</th>
+ <th class="table-date">当前任务节点</th>
<th class="table-date">当前审批人</th>
<th class="table-date">结束时间</th>
<th class="table-set am-text-center">操作</th>
@@ -34,6 +35,7 @@
<td>${list.procName!}</td>
<td>${list.procKey!}</td>
<td>${list.version!}</td>
+ <td>${list.projectName!}</td>
<td>${list.user!}</td>
<td>${list.startTime?datetime}</td>
<td>${list.currentTask!}</td>