射洪市项目管理系统
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xiangpei
2025-03-26 cde5e6335dd02db4d2137ba6d5f330544e764b3d 
 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java


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


@@ -1403,21 +1415,25 @@


     */


    private Long getTimelyTaskNum(String processInsId) {


        // 查出已完成的任务key


        List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()


        HistoricTaskInstanceQuery query = historyService.createHistoricTaskInstanceQuery()


                .processInstanceId(processInsId)


                .finished()


                .list();


        // 排除跳过、容缺的任务，因为这两个操作都会完成任务而产生历史任务


        List<String> jumpAndWaitTaskIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())


                .eq(ProcessLog::getProcessInsId, processInsId)


                .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT, ProcessLogEventTypeEnum.REJECT)


                .list().stream().map(ProcessLog::getTaskId).collect(Collectors.toList());


        hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskIds.indexOf(hisTask.getId()) == -1).collect(Collectors.toList());


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


        // 查出时间正常的任务key


@@ -1460,27 +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> jumpAndWaitTaskIds = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())


        List<String> jumpAndWaitTaskKeys = new LambdaQueryChainWrapper<>(processLogService.getBaseMapper())


                .eq(ProcessLog::getProcessInsId, processInsId)


                .eq(ProcessLog::getProjectId, projectId)


                .in(ProcessLog::getEventType, ProcessLogEventTypeEnum.JUMP, ProcessLogEventTypeEnum.WAIT, ProcessLogEventTypeEnum.REJECT)


                .list().stream().map(ProcessLog::getTaskId).collect(Collectors.toList());


        hisTaskList = hisTaskList.stream().filter(hisTask -> jumpAndWaitTaskIds.indexOf(hisTask.getId()) == -1).collect(Collectors.toList());


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


        // 查出时间正常的任务key


        List<ProcessCoding> codeList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())


                .eq(ProcessCoding::getProcessInsId, processInsId)


@@ -2018,15 +2039,31 @@


                .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());


    }




@@ -2056,15 +2093,33 @@


                .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<>();


@@ -2185,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());


        // 得到未完成的容缺任务


@@ -2203,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<>();


@@ -2325,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());


@@ -2483,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());


    }




    /**