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 list(ConcurrentHashMap 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 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 @@ 流程名称 流程标识 流程版本 + 项目名称 申请人 申请时间 - 当前任务 + 当前任务节点 当前审批人 结束时间 操作 @@ -34,6 +35,7 @@ ${list.procName!} ${list.procKey!} ${list.version!} + ${list.projectName!} ${list.user!} ${list.startTime?datetime} ${list.currentTask!}