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


@@ -25,6 +25,7 @@


import com.ycl.domain.form.TaskDelegationForm;


import com.ycl.domain.json.TaskDelegateData;


import com.ycl.domain.vo.CustomerTaskVO;


import com.ycl.domain.vo.IndexCustomerTaskVO;


import com.ycl.domain.vo.ProjectProcessDetailVO;


import com.ycl.mapper.ProjectInfoMapper;


import com.ycl.mapper.ProjectProcessMapper;


@@ -104,7 +105,7 @@


                ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();


                if (Objects.nonNull(processDefinition)) {


                    vo.setSuspended(processDefinition.isSuspended());


                    vo.setFlowableProcessName(processDefinition.getName());


                    vo.setFlowableProcessName(processDefinition.getName() + "(v" + processDefinition.getVersion() + ")");


                }


            }


        }


@@ -214,9 +215,8 @@


        // 状态统计


        taskStatistics.setTotalTaskNum(this.getTotalTaskNum(processDefId));


        taskStatistics.setTodoTaskNum(this.getTodoTaskNum(projectProcess.getProcessInsId()));


        taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(processDefId, projectProcess.getProcessInsId()));


        taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(processDefId, projectProcess.getProcessInsId(), taskStatistics.getTotalTaskNum()));


//        taskStatistics.setCurrentTask(this.getCurrentNodeTaskList(projectProcess.getProcessInstanceId()));


        taskStatistics.setRemainingTaskNum(this.getRemainingTaskNum(projectProcess.getProcessDefId(), projectProcess.getProcessInsId()));


        detail.setStatistics(taskStatistics);




        Result result = Result.ok();


@@ -255,6 +255,101 @@




        }


        return ok;


    }




    @Override


    public void getIndexTodoTask(String taskName, int pageSize, int pageNum, Result result) {


        TaskQuery taskQuery = taskService.createTaskQuery()


                .active()


                .includeProcessVariables()


                .includeIdentityLinks()


                .orderByTaskCreateTime().desc();




        if (StringUtils.isNotBlank(taskName)) {


            taskQuery.processDefinitionNameLike(taskName);


        }


        result.total(taskQuery.count());


        List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);


        List<IndexCustomerTaskVO> vos = new ArrayList<>();


        for (Task task : taskList) {


            IndexCustomerTaskVO taskVO = new IndexCustomerTaskVO();


            // 当前流程信息


            taskVO.setTaskId(task.getId());


            taskVO.setCreateTime(task.getCreateTime());


            taskVO.setProcessDefId(task.getProcessDefinitionId());


            taskVO.setExecutionId(task.getExecutionId());


            taskVO.setTaskName(task.getName());


            taskVO.setTaskStatus(TaskStatusEnum.TODO);


            // 流程定义信息


            ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()


                    .processDefinitionId(task.getProcessDefinitionId())


                    .singleResult();


            taskVO.setDeployId(pd.getDeploymentId());


            taskVO.setProcessName(pd.getName());


            taskVO.setProcessInsId(task.getProcessInstanceId());


            taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());




            // 流程项目信息


            ProjectInfo project = baseMapper.getProjectInfo(task.getProcessInstanceId());


            if (Objects.nonNull(project)) {


                taskVO.setProjectId(project.getId());


                taskVO.setProjectName(project.getProjectName());


            }




            // 流程发起人信息


            this.setPromoterInfo(taskVO);




            // 一个任务可能有多个候选人/组，所以需要使用list


            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<? extends IdentityLinkInfo> identityLinks = task.getIdentityLinks();


            for (IdentityLinkInfo identityLink : identityLinks) {


                // 绑定的是用户，查出用户姓名、部门


                if (StringUtils.isNotBlank(identityLink.getUserId())) {


                    taskVO.setHandlerType(HandlerTypeEnum.USER);


                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));


                    if (Objects.nonNull(sysUser)) {


                        handlerIds.add(sysUser.getUserId());


                        handlerNames.add(sysUser.getNickName());


                        if (Objects.nonNull(sysUser.getDept())) {


                            handlerUnitIds.add(sysUser.getDept().getDeptId());


                            handlerUnitNames.add(sysUser.getDept().getDeptName());


                        }


                    }


                    // 绑定的是角色或者部门


                } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {


                    if (identityLink.getGroupId().startsWith("dept")) {   // 部门的id是加了前缀的如：dept:1


                        taskVO.setHandlerType(HandlerTypeEnum.DEPT);


                        String[] split = identityLink.getGroupId().split(":");


                        if (split.length > 1) {


                            // 部门


                            SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));


                            if (Objects.nonNull(dept)) {


                                handlerUnitIds.add(dept.getDeptId());


                                handlerUnitNames.add(dept.getDeptName());


                            }


                        }


                    } else {


                        taskVO.setHandlerType(HandlerTypeEnum.ROLE);


                        SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));


                        if (Objects.nonNull(role)) {


                            handlerUnitIds.add(role.getRoleId());


                            handlerUnitNames.add(role.getRoleName());


                        }


                    }


                }


            }


            taskVO.setHandlerId(handlerIds);


            taskVO.setHandlerName(handlerNames);


            taskVO.setHandlerUnitId(handlerUnitIds);


            taskVO.setHandlerUnitName(handlerUnitNames);


            vos.add(taskVO);


        }


        result.put("taskList", vos);


    }




    @Override


@@ -443,7 +538,7 @@


        jsonData.setAfterHandlerIds(afterHandlerIds);


        jsonData.setAfterHandlerType(form.getPeopleType());


        // 添加日志


        flowLogService.add(task.getId(), form.getProcessInsId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));


        flowLogService.add(task.getId(), task.getProcessInstanceId(), FlowLogEventTypeEnum.DELEGATE, form.getProjectId(), JSON.toJSONString(jsonData));




        return Result.ok("转办成功");


    }


@@ -530,6 +625,7 @@


                        SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));


                        if (Objects.nonNull(role)) {


                            handlerUnitIds.add(Long.parseLong(identityLink.getGroupId()));


                            handlerUnitNames.add(role.getRoleName());


                        }


                    }


                }


@@ -766,8 +862,9 @@


        List<Long> handlerUnitIds = new ArrayList<>(2);


        List<String> handlerUnitNames = new ArrayList<>(2);




        // 判断任务状态


        List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {


        // 判断任务状态，构建vo


        List<CustomerTaskVO> vos = new ArrayList<>(48);


        for (UserTask userTask : userTasks) {


            CustomerTaskVO vo = new CustomerTaskVO();


            vo.setProcessInsId(process.getId());


            vo.setProcessDefId(processDefinitionId);


@@ -827,14 +924,12 @@


                    vo.setHandlerName(handlerNames);


                    vo.setHandlerUnitId(handlerUnitIds);


                    vo.setHandlerUnitName(handlerUnitNames);


                    return vo;


                } else {


                    return null;


                    continue;


                }


            } else {


                return null;


            }


        }).filter(Objects::nonNull).collect(Collectors.toList());


            vos.add(vo);


        }


        result.data(vos);


        return vos;


    }


@@ -846,34 +941,22 @@


     * @param processInsId        流程实例id


     * @return


     */


    private Long getRemainingTaskNum(String processDefinitionId, String processInsId) {


    private Long getRemainingTaskNum(String processDefinitionId, String processInsId, long totalNum) {




        List<UserTask> allUserTaskElement = this.getAllUserTaskElement(processDefinitionId);


        // 查出流程


        ProcessInstance process = runtimeService.createProcessInstanceQuery().processInstanceId(processInsId).singleResult();


        if (Objects.isNull(process)) {


            // 运行时未找到流程，说明流程已经结束了


            return 0L;


        }


        long num = 0L;


        // 判断任务状态


        for (UserTask userTask : allUserTaskElement) {


            Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();


            if (Objects.isNull(task)) {


                // 如果任务在运行时没找到，那么可能为未开始或者已完成，只查询未开始的


                List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()


                        .processInstanceId(process.getProcessInstanceId())


                        .taskDefinitionKey(userTask.getId())


                        .includeIdentityLinks()


                        .orderByHistoricTaskInstanceStartTime()


                        .desc()


                        .list();


                if (CollectionUtils.isEmpty(historicTasks)) {


                    num++;


                }


            }


        }


        return num;


        // 查出已完成的任务，用总任务数-已完成的就得到剩余事项


        List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery()


                .processInstanceId(process.getProcessInstanceId())


                .finished()


                .list();


        long num = list.stream().map(HistoricTaskInstance::getTaskDefinitionId).distinct().count();




        return totalNum - num;


    }