From 55a173ec806bbe9ea00c6801e6c5b87b7af2f3eb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 10 二月 2025 16:00:45 +0800
Subject: [PATCH] 超时统计、临期事项统计逻辑更换、剩余事项bug

---
 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java |  374 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 367 insertions(+), 7 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 f00ba94..dc66f44 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,10 +1,12 @@
 package com.ycl.service.impl;
 
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
 import com.ycl.common.constant.ProcessConstants;
+import com.ycl.common.constant.ProcessOverTimeConstants;
 import com.ycl.common.core.domain.entity.SysDept;
 import com.ycl.common.core.domain.entity.SysRole;
 import com.ycl.common.core.domain.entity.SysUser;
@@ -13,9 +15,12 @@
 import com.ycl.common.enums.business.TaskStatusEnum;
 import com.ycl.common.utils.SecurityUtils;
 import com.ycl.constant.TaskTypeConstant;
+import com.ycl.domain.entity.ProcessCoding;
 import com.ycl.domain.entity.ProjectInfo;
 import com.ycl.domain.entity.ProjectProcess;
+import com.ycl.domain.entity.SysForm;
 import com.ycl.domain.form.TaskDelegationForm;
+import com.ycl.domain.form.TaskJumpForm;
 import com.ycl.domain.json.DelegateData;
 import com.ycl.domain.vo.CustomerTaskVO;
 import com.ycl.domain.vo.IndexCustomerTaskVO;
@@ -23,6 +28,9 @@
 import com.ycl.event.event.TaskLogEvent;
 import com.ycl.mapper.ProjectInfoMapper;
 import com.ycl.mapper.ProjectProcessMapper;
+import com.ycl.service.IFlowTaskService;
+import com.ycl.service.ISysFormService;
+import com.ycl.service.ProcessCodingService;
 import com.ycl.service.ProjectProcessService;
 import com.ycl.common.base.Result;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -79,6 +87,9 @@
     private final ISysRoleService sysRoleService;
     private final ISysDeptService sysDeptService;
     private final TaskCommonService taskCommonService;
+    private final IFlowTaskService flowTaskService;
+    private final ISysFormService formService;
+    private final ProcessCodingService processCodingService;
     private final ApplicationEventPublisher publisher;
 
     /**
@@ -220,6 +231,9 @@
         taskStatistics.setTotalTaskNum(this.getTotalTaskNum(processDefId));
         taskStatistics.setTodoTaskNum(this.getTodoTaskNum(projectProcess.getProcessInsId()));
         taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(processDefId, projectProcess.getProcessInsId(), taskStatistics.getTotalTaskNum()));
+        taskStatistics.setTimelyFinishedTaskNum(this.getTimelyTaskNum(projectProcess.getProcessInsId()));
+        taskStatistics.setOvertimeTaskNum(this.getOvertimeTaskNum(projectProcess.getProcessInsId()));
+        taskStatistics.setWillOvertimeTaskNum(this.getWillOvertimeTaskNum(projectProcess.getProcessInsId()));
 //        taskStatistics.setCurrentTask(this.getCurrentNodeTaskList(projectProcess.getProcessInstanceId()));
         detail.setStatistics(taskStatistics);
 
@@ -253,6 +267,15 @@
                 break;
             case TaskTypeConstant.REMAINING:
                 this.getRemainingTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+                break;
+            case TaskTypeConstant.TIMELY:
+                this.getTimelyTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+                break;
+            case TaskTypeConstant.OVERTIME:
+                this.getOvertimeTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+                break;
+            case TaskTypeConstant.WILL_OVER_TIME:
+                this.getWillOvertimeTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                 break;
             default:
                 break;
@@ -476,7 +499,7 @@
             for (FlowElement flowElement : flowElements) {
                 if (flowElement instanceof UserTask && flowElement.getId().equals(task.getTaskDefinitionKey())) {
                     UserTask userTask = (UserTask) flowElement;
-                    needAuditing = taskCommonService.checkTaskNeedAuditing(userTask.getExtensionElements().get("properties"));
+                    needAuditing = taskCommonService.checkHasExeProperty(userTask.getExtensionElements().get("properties"), ProcessConstants.EXTENSION_PROPERTY_NEED_AUDITING_TEXT);
                     break;
                 }
 
@@ -566,6 +589,28 @@
         publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), task.getId(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
 
         return Result.ok("杞姙鎴愬姛");
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result taskJump(TaskJumpForm form) {
+        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
+        if (Objects.nonNull(task)) {
+            // 娣诲姞璺宠繃鏃ュ織
+            publisher.publishEvent(new TaskLogEvent(this, form.getProjectId(), form.getProcessInsId(), form.getTaskId(), ProcessLogEventTypeEnum.JUMP, null));
+            // 鏌ュ嚭璇ヤ换鍔$粦瀹氱殑琛ㄥ崟
+
+            Map<String, Object> data = new HashMap<>(1);
+            if (StringUtils.isNotBlank(task.getFormKey())) {
+                SysForm sysForm = formService.selectSysFormById(Long.parseLong(task.getFormKey()));
+                if (Objects.nonNull(sysForm)) {
+                    data.put(ProcessConstants.TASK_FORM_KEY, JSONObject.parseObject(sysForm.getFormContent()));
+                }
+            }
+            // 瀹屾垚浠诲姟
+            flowTaskService.completeSubmitForm(form.getTaskId(), data);
+        }
+        return Result.ok("鎿嶄綔鎴愬姛");
     }
 
     /**
@@ -807,11 +852,19 @@
         taskVO.setTaskName(task.getName());
         taskVO.setTaskStatus(TaskStatusEnum.TODO);
         // 娴佺▼瀹氫箟淇℃伅
-        ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
-                .processDefinitionId(task.getProcessDefinitionId())
-                .singleResult();
-        taskVO.setDeployId(pd.getDeploymentId());
-        taskVO.setProcessName(pd.getName());
+        ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+        String deployId = "";
+        String processName = "";
+        if (Objects.nonNull(process)) {
+            deployId = process.getDeploymentId();
+            processName = process.getProcessDefinitionName();
+        } else {
+            HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(task.getProcessInstanceId()).singleResult();
+            deployId = hisProcess.getDeploymentId();
+            processName = hisProcess.getProcessDefinitionName();
+        }
+        taskVO.setDeployId(deployId);
+        taskVO.setProcessName(processName);
         taskVO.setProcessInsId(task.getProcessInstanceId());
         taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
 
@@ -869,6 +922,313 @@
             taskVO.setHandlerUnitId(handlerUnitIds);
             taskVO.setHandlerUnitName(handlerUnitNames);
         }
+    }
+
+    /**
+     * 缁熻鎸夋椂瀹屾垚鐨勪换鍔�
+     *
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @return
+     */
+    private Long getTimelyTaskNum(String processInsId) {
+        // 鏌ュ嚭鏃堕棿姝e父鐨勪换鍔d
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.NORMAL)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(taskKeyList)) {
+            return 0L;
+        }
+        // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
+        return historyService.createHistoricTaskInstanceQuery()
+                .processInstanceId(processInsId)
+                .finished()
+                .caseDefinitionKeyIn(taskKeyList)
+                .count();
+    }
+
+    /**
+     * 鏌ヨ鎸夋椂瀹屾垚鐨勪换鍔�
+     *
+     * @param processDefinitionId 娴佺▼瀹氫箟id
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+     * @param pageNum
+     * @param pageSize
+     * @param result
+     * @return
+     */
+    private List<CustomerTaskVO> getTimelyTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
+        int startNum = pageSize * (pageNum - 1);
+        int endNum = startNum + pageSize;
+
+        // 鏌ュ嚭鏃堕棿姝e父鐨勪换鍔d
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.NORMAL)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+
+        List<HistoricTaskInstance> finishedTaskList = new ArrayList<>();
+        if (! CollectionUtils.isEmpty(taskKeyList)) {
+            // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
+            finishedTaskList = historyService.createHistoricTaskInstanceQuery()
+                    .processInstanceId(processInsId)
+                    .finished()
+                    .taskNameLike(taskName)
+                    .caseDefinitionKeyIn(taskKeyList)
+                    .includeIdentityLinks()
+                    .list();
+        }
+
+        if (startNum >= finishedTaskList.size()) {
+            // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+            return new ArrayList<>();
+        }
+        result.total(finishedTaskList.size());
+        int end = Math.min(endNum, finishedTaskList.size());
+        List<HistoricTaskInstance> pageFinishedTaskList = finishedTaskList.subList(startNum, end);
+        List<String> taskDefs = pageFinishedTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).collect(Collectors.toList());
+        Map<String, HistoricTaskInstance> keyMap = pageFinishedTaskList.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);
+
+            HistoricTaskInstance hisTask = keyMap.get(userTask.getId());
+            if (Objects.nonNull(hisTask)) {
+                vo.setTaskStatus(TaskStatusEnum.FINISHED);
+                // 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
+                vo.setTaskId(hisTask.getId());
+                vo.setExecutionId(hisTask.getExecutionId());
+                vo.setCreateTime(hisTask.getStartTime());
+
+                // 鏌ヨ瀹為檯澶勭悊浜�
+                long handlerUserId = Long.parseLong(hisTask.getAssignee());
+                SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
+                if (Objects.nonNull(handlerUser)) {
+                    handlerIds.add(handlerUserId);
+                    handlerNames.add(handlerUser.getNickName());
+                    vo.setActualHandlerUserId(hisTask.getAssignee());
+                    vo.setActualHandlerUserName(handlerUser.getNickName());
+                }
+                vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
+                this.setPromoterAndHandler(vo, hisTask.getIdentityLinks());
+            }
+            vo.setHandlerId(handlerIds);
+            vo.setHandlerName(handlerNames);
+            vo.setHandlerUnitId(handlerUnitIds);
+            vo.setHandlerUnitName(handlerUnitNames);
+            return vo;
+        }).collect(Collectors.toList());
+        result.data(vos);
+        return vos;
+    }
+
+
+    /**
+     * 缁熻瓒呮椂鐨勪换鍔℃暟
+     *
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @return
+     */
+    private Long getOvertimeTaskNum(String processInsId) {
+        // 鏌ュ嚭鏃堕棿姝e父鐨勪换鍔d
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(taskKeyList)) {
+            return 0L;
+        }
+        // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
+        return taskService.createTaskQuery()
+                .processInstanceId(processInsId)
+                .caseDefinitionKeyIn(taskKeyList)
+                .count();
+    }
+
+    /**
+     * 鏌ヨ瓒呮椂鐨勪换鍔�
+     *
+     * @param processDefinitionId 娴佺▼瀹氫箟id
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+     * @param pageNum
+     * @param pageSize
+     * @param result
+     * @return
+     */
+    private List<CustomerTaskVO> getOvertimeTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
+        int startNum = pageSize * (pageNum - 1);
+        int endNum = startNum + pageSize;
+
+        // 鏌ュ嚭鍗冲皢瓒呮椂鐨勪换鍔�
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+
+        List<Task> taskList = new ArrayList<>();
+        // 鏌ュ嚭鎵�鏈夋鍦ㄥ鐞�(杩愯鏃�)鐨勪换鍔�
+        if (! CollectionUtils.isEmpty(taskKeyList)) {
+            taskList = taskService.createTaskQuery()
+                    .processInstanceId(processInsId)
+                    .taskNameLike(taskName)
+                    .caseDefinitionKeyIn(taskKeyList)
+                    .list();
+        }
+
+        if (startNum >= taskList.size()) {
+            // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+            return new ArrayList<>();
+        }
+        result.total(taskList.size());
+        int end = Math.min(endNum, taskList.size());
+        List<Task> pageTaskList = taskList.subList(startNum, end);
+        List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+        Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+
+        // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
+        List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
+
+        // 鏌ヨ浠诲姟鐩稿叧淇℃伅
+        List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
+            Task task = keyMap.get(userTask.getId());
+            CustomerTaskVO vo = new CustomerTaskVO();
+            this.setRuntimeTaskInfo(task, vo);
+            return vo;
+        }).collect(Collectors.toList());
+        result.data(vos);
+        return vos;
+    }
+
+    /**
+     * 缁熻鍗冲皢瓒呮椂鐨勪换鍔℃暟
+     *
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @return
+     */
+    private Long getWillOvertimeTaskNum(String processInsId) {
+        // 鏌ュ嚭鏃堕棿姝e父鐨勪换鍔d
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.WILLOVERTIME)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(taskKeyList)) {
+            return 0L;
+        }
+        // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
+        return taskService.createTaskQuery()
+                .processInstanceId(processInsId)
+                .caseDefinitionKeyIn(taskKeyList)
+                .count();
+    }
+
+    /**
+     * 鏌ヨ鍗冲皢瓒呮椂鐨勪换鍔�
+     *
+     * @param processDefinitionId 娴佺▼瀹氫箟id
+     * @param processInsId 娴佺▼瀹炰緥id
+     * @param taskName 浠诲姟鍚嶇О--鎼滅储鏉′欢
+     * @param pageNum
+     * @param pageSize
+     * @param result
+     * @return
+     */
+    private List<CustomerTaskVO> getWillOvertimeTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
+        int startNum = pageSize * (pageNum - 1);
+        int endNum = startNum + pageSize;
+
+        // 鏌ュ嚭鍗冲皢瓒呮椂鐨勪换鍔�
+        List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+                .select(ProcessCoding::getTaskDefKey)
+                .eq(ProcessCoding::getProcessInsId, processInsId)
+                .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.WILLOVERTIME)
+                .list()
+                .stream()
+                .map(ProcessCoding::getTaskDefKey)
+                .collect(Collectors.toList());
+
+        List<Task> taskList = new ArrayList<>();
+        // 鏌ュ嚭鎵�鏈夋鍦ㄥ鐞�(杩愯鏃�)鐨勪换鍔�
+        if (! CollectionUtils.isEmpty(taskKeyList)) {
+            taskList = taskService.createTaskQuery()
+                    .processInstanceId(processInsId)
+                    .taskNameLike(taskName)
+                    .caseDefinitionKeyIn(taskKeyList)
+                    .list();
+        }
+
+        if (startNum >= taskList.size()) {
+            // 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
+            return new ArrayList<>();
+        }
+        result.total(taskList.size());
+        int end = Math.min(endNum, taskList.size());
+        List<Task> pageTaskList = taskList.subList(startNum, end);
+        List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
+        Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+
+        // 寰楀埌鐩爣浠诲姟瀵瑰簲鐨勫畾涔�
+        List<UserTask> finishedUserTaskElement = this.getAllUserTaskElement(processDefinitionId).stream().filter(el -> taskDefs.contains(el.getId())).collect(Collectors.toList());
+
+        // 鏌ヨ浠诲姟鐩稿叧淇℃伅
+        List<CustomerTaskVO> vos = finishedUserTaskElement.stream().map(userTask -> {
+            Task task = keyMap.get(userTask.getId());
+            CustomerTaskVO vo = new CustomerTaskVO();
+            this.setRuntimeTaskInfo(task, vo);
+            return vo;
+        }).collect(Collectors.toList());
+        result.data(vos);
+        return vos;
     }
 
     /**
@@ -1015,7 +1375,7 @@
                 .processInstanceId(process.getProcessInstanceId())
                 .finished()
                 .list();
-        long num = list.stream().map(HistoricTaskInstance::getTaskDefinitionId).distinct().count();
+        long num = list.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().count();
 
         return totalNum - num;
     }

--
Gitblit v1.8.0