From cde5e6335dd02db4d2137ba6d5f330544e764b3d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 04:13:26 +0800
Subject: [PATCH] 任务统计bug
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 280 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 256 insertions(+), 24 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 6e44713..b6ed61c 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -306,7 +306,7 @@
taskStatistics.setOvertimeTaskNum(this.getOvertimeTaskNum(projectProcess.getProcessInsId()));
taskStatistics.setWillOvertimeTaskNum(this.getWillOvertimeTaskNum(projectProcess.getProcessInsId()));
taskStatistics.setWaitTaskNum(this.getWaitTaskNum(projectProcess.getProcessInsId()));
-// taskStatistics.setCurrentTask(this.getCurrentNodeTaskList(projectProcess.getProcessInstanceId()));
+ taskStatistics.setJumpTaskNum(this.getJumpTaskNum(projectProcess.getProcessInsId()));
detail.setStatistics(taskStatistics);
Result result = Result.ok();
@@ -331,7 +331,7 @@
// 鎺掗櫎瀹圭己鍚庡張瀹屾垚鐨勪换鍔�
List<ProcessLog> finishedTaskList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
.eq(ProcessLog::getProcessInsId, processInsId)
- .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED, ProcessLogEventTypeEnum.REJECT)
.list();
List<String> finishedTaskIds = finishedTaskList.stream().map(ProcessLog::getTaskId).distinct().collect(Collectors.toList());
// 寰楀埌鏈畬鎴愮殑瀹圭己浠诲姟
@@ -339,7 +339,19 @@
if (CollectionUtils.isEmpty(waitTaskIds)) {
return 0L;
}
- return Long.valueOf(waitTaskIds.size());
+ // 瀹圭己鐨勪换鍔￠兘灞炰簬鍘嗗彶浠诲姟锛屽彧鏄渶瑕佽ˉ琛ㄥ崟鏁版嵁
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInsId)
+ .taskIds(waitTaskIds)
+ .includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ hisTaskList = this.distinctHisTask(hisTaskList);
+ // 鎺掗櫎杩愯鏃朵换鍔�
+ List<String> runTaskKeys = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ hisTaskList = hisTaskList.stream().filter(his -> !runTaskKeys.contains(his.getTaskDefinitionKey())).collect(Collectors.toList());
+ return Long.valueOf(hisTaskList.size());
}
@Override
@@ -363,6 +375,9 @@
break;
case TaskTypeConstant.WAIT:
this.getWaitTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+ break;
+ case TaskTypeConstant.JUMP:
+ this.getJumpTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
break;
case TaskTypeConstant.REMAINING:
this.getRemainingTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
@@ -1400,15 +1415,25 @@
*/
private Long getTimelyTaskNum(String processInsId) {
// 鏌ュ嚭宸插畬鎴愮殑浠诲姟key
- List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInsId)
.finished()
- .list();
- hisTaskList = this.distinctHisTask(hisTaskList);
+ .includeIdentityLinks()
+ .orderByTaskCreateTime()
+ .desc();
+ List<HistoricTaskInstance> hisTaskList = query.list();
if (CollectionUtils.isEmpty(hisTaskList)) {
return 0L;
}
-
+ hisTaskList = this.distinctHisTask(hisTaskList);
+ // 鎺掗櫎璺宠繃銆佸缂虹殑浠诲姟锛屽洜涓鸿繖涓や釜鎿嶄綔閮戒細瀹屾垚浠诲姟鑰屼骇鐢熷巻鍙蹭换鍔�
+ List<String> jumpAndWaitTaskKeys = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT) // TODO 濡傛灉杩愯鏃朵换鍔℃濂芥槸琚┏鍥炵殑锛岄渶瑕佹兂鍔炴硶鎺掗櫎璋冭椹冲洖鐨勪换鍔★紝涓嶈兘鐩存帴鍦ㄨ繖鍔� ProcessLogEventTypeEnum.REJECT
+ .list().stream().map(ProcessLog::getTaskDefKey).collect(Collectors.toList());
+ List<String> runtimeTaskKey = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ jumpAndWaitTaskKeys.addAll(runtimeTaskKey);
+ hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskKeys.indexOf(hisTask.getTaskDefinitionKey()) == -1).collect(Collectors.toList());
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
@@ -1451,21 +1476,32 @@
int endNum = startNum + pageSize;
// 鏌ュ嚭宸插畬鎴愮殑浠诲姟key
- List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInsId)
.finished()
- .taskNameLike(taskName)
.includeIdentityLinks()
.orderByTaskCreateTime()
- .desc()
- .list();
+ .desc();
+ if (StringUtils.isNotBlank(taskName)) {
+ query.taskNameLike(taskName);
+ }
+ List<HistoricTaskInstance> hisTaskList = query.list();
if (CollectionUtils.isEmpty(hisTaskList)) {
result.total(0);
return new ArrayList<>();
}
-
+ hisTaskList = this.distinctHisTask(hisTaskList);
+ // 鎺掗櫎璺宠繃銆佸缂虹殑浠诲姟锛屽洜涓鸿繖涓や釜鎿嶄綔閮戒細瀹屾垚浠诲姟鑰屼骇鐢熷巻鍙蹭换鍔�
+ List<String> jumpAndWaitTaskKeys = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getProjectId, projectId)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT)
+ .list().stream().map(ProcessLog::getTaskDefKey).collect(Collectors.toList());
+ List<String> runtimeTaskKey = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ jumpAndWaitTaskKeys.addAll(runtimeTaskKey);
+ hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskKeys.indexOf(hisTask.getTaskDefinitionKey()) == -1).collect(Collectors.toList());
List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- Map<String, HistoricTaskInstance> hisTaskMap = this.distinctHisTask(hisTaskList).stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
+ Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
// 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
@@ -1991,6 +2027,190 @@
}
/**
+ * 鑾峰彇璺宠繃浠诲姟
+ *
+ * @param processInsId
+ * @return
+ */
+ private Long getJumpTaskNum(String processInsId) {
+ // 鏌ュ嚭璺宠繃鐨勪换鍔�
+ List<ProcessLog> allJumpTaskList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP)
+ .orderByDesc(ProcessLog::getGmtCreate)
+ .list();
+ // 鎺掗櫎椹冲洖鐨�
+ List<String> rejectTaskIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getTaskId)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.REJECT)
+ .orderByDesc(ProcessLog::getGmtCreate)
+ .list().stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
+
+ List<String> jumpTaskIds = allJumpTaskList.stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
+ jumpTaskIds.removeAll(rejectTaskIds);
+ if(CollectionUtils.isEmpty(jumpTaskIds)) {
+ return 0L;
+ }
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInsId)
+ .finished()
+ .taskIds(jumpTaskIds)
+ .includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ hisTaskList = this.distinctHisTask(hisTaskList);
+ // 鎺掗櫎杩愯鏃朵换鍔�
+ List<String> runTaskKeys = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ hisTaskList = hisTaskList.stream().filter(his -> !runTaskKeys.contains(his.getTaskDefinitionKey())).collect(Collectors.toList());
+ return Long.valueOf(hisTaskList.size());
+ }
+
+ /**
+ * 鑾峰彇璺宠繃浠诲姟
+ *
+ * @param projectId
+ * @param processDefinitionId
+ * @param processInsId
+ * @param taskName
+ * @param pageNum
+ * @param pageSize
+ * @param result
+ * @return
+ */
+ private List<CustomerTaskVO> getJumpTask(String projectId,
+ String processDefinitionId,
+ String processInsId,
+ String taskName,
+ Integer pageNum,
+ Integer pageSize,
+ Result result) {
+ // 鏌ュ嚭璺宠繃鐨勪换鍔�
+ List<ProcessLog> allJumpTaskList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP)
+ .like(StringUtils.isNotBlank(taskName), ProcessLog::getTaskName, taskName)
+ .orderByDesc(ProcessLog::getGmtCreate)
+ .list();
+ // 鎺掗櫎椹冲洖鐨�
+ List<String> rejectTaskIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getTaskId)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.REJECT)
+ .like(StringUtils.isNotBlank(taskName), ProcessLog::getTaskName, taskName)
+ .orderByDesc(ProcessLog::getGmtCreate)
+ .list().stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
+
+ List<String> jumpTaskIds = allJumpTaskList.stream().map(ProcessLog::getTaskId).collect(Collectors.toList());
+ jumpTaskIds.removeAll(rejectTaskIds);
+ if(CollectionUtils.isEmpty(jumpTaskIds)) {
+ result.total(0l);
+ return new ArrayList<>();
+ }
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInsId)
+ .finished()
+ .taskIds(jumpTaskIds)
+ .includeIdentityLinks()
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ hisTaskList = this.distinctHisTask(hisTaskList);
+ // 鎺掗櫎杩愯鏃朵换鍔�
+ List<String> runTaskKeys = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ hisTaskList = hisTaskList.stream().filter(his -> !runTaskKeys.contains(his.getTaskDefinitionKey())).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(hisTaskList)) {
+ result.total(0l);
+ return new ArrayList<>();
+ }
+ int startNum = pageSize * (pageNum - 1);
+ int endNum = startNum + pageSize;
+ if (startNum >= hisTaskList.size()) {
+ result.total(0l);
+ // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+ return new ArrayList<>();
+ }
+ result.total(hisTaskList.size());
+ int end = Math.min(endNum, hisTaskList.size());
+ List<HistoricTaskInstance> targetTaskList = hisTaskList.subList(startNum, end);
+
+ // 杞崲鎴怴O
+ // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
+ List<String> taskDefs = targetTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).collect(Collectors.toList());
+ Map<String, HistoricTaskInstance> keyMap = targetTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
+ List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
+
+ // 鏌ュ嚭娴佺▼
+ ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ String deployId = "";
+ String processName = "";
+ if (Objects.nonNull(process)) {
+ deployId = process.getDeploymentId();
+ processName = process.getProcessDefinitionName();
+ } else {
+ HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ deployId = hisProcess.getDeploymentId();
+ processName = hisProcess.getProcessDefinitionName();
+ }
+
+ String finalDeployId = deployId;
+ String finalProcessName = processName;
+ List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
+ CustomerTaskVO vo = new CustomerTaskVO();
+ vo.setProcessInsId(processInsId);
+ vo.setProcessDefId(processDefinitionId);
+ vo.setDeployId(finalDeployId);
+ vo.setTaskName(userTask.getName());
+ vo.setProcessName(finalProcessName);
+
+ // 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
+ List<Long> handlerIds = new ArrayList<>(2);
+ List<String> handlerNames = new ArrayList<>(2);
+ List<Long> handlerUnitIds = new ArrayList<>(2);
+ List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
+ vo.setHandlerId(handlerIds);
+ vo.setHandlerName(handlerNames);
+ vo.setHandlerUnitId(handlerUnitIds);
+ vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
+
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
+ HistoricTaskInstance hisTask = keyMap.get(userTask.getId());
+ if (Objects.nonNull(hisTask)) {
+ vo.setTaskStatus(TaskStatusEnum.JUMP);
+ // 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
+ vo.setTaskId(hisTask.getId());
+ vo.setExecutionId(hisTask.getExecutionId());
+ vo.setCreateTime(hisTask.getStartTime());
+
+ // 鏌ヨ瀹為檯澶勭悊浜�
+ if (StringUtils.isNotBlank(hisTask.getAssignee())) {
+ long handlerUserId = Long.parseLong(hisTask.getAssignee());
+ SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
+ if (Objects.nonNull(handlerUser)) {
+ vo.getHandlerId().add(handlerUserId);
+ vo.getHandlerName().add(this.getUserShowName(handlerUser));
+ if (Objects.nonNull(handlerUser.getDept())) {
+ vo.getHandlerUnitId().add(handlerUser.getDept().getDeptId());
+ vo.getHandlerUnitName().add(handlerUser.getDept().getDeptName());
+ }
+ }
+ }
+ this.setHandler(vo, hisTask.getIdentityLinks());
+ vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
+ }
+ this.distinctVo(vo);
+ return vo;
+ }).collect(Collectors.toList());
+ result.data(vos);
+ return vos;
+ }
+
+ /**
* 瀹圭己浠诲姟鍒嗛〉
*
* @param projectId
@@ -2020,7 +2240,7 @@
// 鎺掗櫎瀹圭己鍚庡張瀹屾垚鐨勪换鍔�
List<ProcessLog> finishedTaskList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
.eq(ProcessLog::getProcessInsId, processInsId)
- .eq(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED, ProcessLogEventTypeEnum.REJECT)
.list();
List<String> finishedTaskIds = finishedTaskList.stream().map(ProcessLog::getTaskId).distinct().collect(Collectors.toList());
// 寰楀埌鏈畬鎴愮殑瀹圭己浠诲姟
@@ -2038,7 +2258,9 @@
.desc()
.list();
hisTaskList = this.distinctHisTask(hisTaskList);
-
+ // 鎺掗櫎杩愯鏃朵换鍔�
+ List<String> runTaskKeys = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ hisTaskList = hisTaskList.stream().filter(his -> !runTaskKeys.contains(his.getTaskDefinitionKey())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(hisTaskList)) {
result.total(0l);
return new ArrayList<>();
@@ -2160,8 +2382,14 @@
// 鎺掗櫎杩涜涓殑浠诲姟鍜屽凡瀹屾垚鐨勪换鍔�
List<String> runTaskKeyList = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
- List<String> finishedTaskKeyList = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInsId).finished().list().stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
- allUserTaskElement = allUserTaskElement.stream().filter(el -> !runTaskKeyList.contains(el.getId()) && !finishedTaskKeyList.contains(el.getId())).collect(Collectors.toList());
+ List<String> finishedTaskKeyList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getTaskDefKey)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT)
+ .list().stream().map(ProcessLog::getTaskDefKey).collect(Collectors.toList());
+ finishedTaskKeyList.addAll(runTaskKeyList);
+// List<String> finishedTaskKeyList = historyService.createHistoricTaskInstanceQuery().processInstanceId(processInsId).finished().list().stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ allUserTaskElement = allUserTaskElement.stream().filter(el -> finishedTaskKeyList.indexOf(el.getId()) == -1).collect(Collectors.toList());
// 妯℃嫙妯＄硦鏌ヨ
if (StringUtils.isNotBlank(taskName)) {
allUserTaskElement = allUserTaskElement.stream().filter(taskEl -> taskEl.getName().contains(taskName)).collect(Collectors.toList());
@@ -2318,14 +2546,18 @@
// 杩愯鏃舵湭鎵惧埌娴佺▼锛岃鏄庢祦绋嬪凡缁忕粨鏉熶簡
return 0L;
}
- // 鏌ュ嚭宸插畬鎴愮殑浠诲姟锛岀敤鎬讳换鍔℃暟-宸插畬鎴愮殑灏卞緱鍒板墿浣欎簨椤�
- List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(process.getProcessInstanceId())
- .finished()
- .list();
- long num = list.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().count();
+ List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);
- return totalNum - num;
+ // 鎺掗櫎杩涜涓殑浠诲姟鍜屽凡瀹屾垚鐨勪换鍔�
+ List<String> runTaskKeyList = taskService.createTaskQuery().processInstanceId(processInsId).list().stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+ List<String> finishedTaskKeyList = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())
+ .select(ProcessLog::getTaskDefKey)
+ .eq(ProcessLog::getProcessInsId, processInsId)
+ .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.FINISHED, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT)
+ .list().stream().map(ProcessLog::getTaskDefKey).collect(Collectors.toList());
+ finishedTaskKeyList.addAll(runTaskKeyList);
+ allUserTaskElement = allUserTaskElement.stream().filter(el -> finishedTaskKeyList.indexOf(el.getId()) == -1).collect(Collectors.toList());
+ return Long.valueOf(allUserTaskElement.size());
}
/**
--
Gitblit v1.8.0