mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

审批流程 流程实列增加项目名称

master
pengqiang 2022-08-08 16:16:26 +08:00
parent 9b4962e0e6
commit ef77ff77ea
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cn/palmte/work/pojo/ActProcIns.java
View File

@ -20,4 +20,5 @@ public class ActProcIns {
private Date endTime;
private String projectName;
}

7
src/main/java/cn/palmte/work/service/ActProcInsService.java
View File

@ -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);

4
src/main/resources/templates/admin/act_proc_ins_list.ftl
View File

@ -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>