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 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 @@ ${list.procName!} ${list.procKey!} ${list.version!} - ${list.projectName!} + ${list.projectName!}${list.projectTitle!} ${list.user!} ${list.startTime?datetime} ${list.currentTask!}