Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java

zhanghua

2025-01-16 245663c4f6092eb9f06905e684d6ecb04aeb1313

Merge branch 'master' of http://42.193.1.25:9521/r/project_management-java

 business/src/main/java/com/ycl/domain/vo/CustomerTaskVO.java

@@ -97,6 +97,16 @@
    private List<String> handlerUnitName;

    /**
     * 实际处理人id
     */
    private String actualHandlerUserId;

    /**
     * 实际处理人姓名
     */
    private String actualHandlerUserName;

    /**
     * 办理期限
     */
    private String timeLimit;

 business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java

@@ -52,6 +52,7 @@
import org.flowable.identitylink.api.IdentityLinkInfo;
import org.flowable.identitylink.api.IdentityLinkType;
import org.flowable.identitylink.api.history.HistoricIdentityLink;
import org.flowable.identitylink.service.impl.persistence.entity.IdentityLinkEntityImpl;
import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
@@ -155,6 +156,7 @@
        entity.setProcessDefId(processDefId);
        entity.setProcessInsId(processInsId);
        baseMapper.insert(entity);

        return Result.ok("流程启动成功");
    }

@@ -166,6 +168,14 @@
     * @return
     */
    private String startPro(Long projectId, String processDefId) {

        ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
                .select(ProjectInfo::getCreateBy)
                .eq(ProjectInfo::getId, projectId)
                .one();
        if (Objects.isNull(project)) {
            throw new RuntimeException("项目不存在");
        }
        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(processDefId)
                .latestVersion().singleResult();
        if (Objects.nonNull(processDefinition) && processDefinition.isSuspended()) {
@@ -176,6 +186,9 @@
        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
        identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
        variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());

        // 将该项目的申请人（业主方）作为流程中某些环节的处理人
        variables.put(ProcessConstants.DATA_LAUNCH, project.getCreateBy());
        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
        return processInstance.getId();
    }
@@ -262,11 +275,18 @@
        TaskQuery taskQuery = taskService.createTaskQuery()
                .active()
                .includeProcessVariables()
                .includeIdentityLinks()
                .orderByTaskCreateTime().desc();

        if (StringUtils.isNotBlank(taskName)) {
            taskQuery.processDefinitionNameLike(taskName);
        }
        if (! SecurityUtils.getLoginUser().getUser().isAdmin()) {
            taskQuery
                    .or()
                    .taskCandidateGroupIn(taskCommonService.getCurrentUserGroups())
                    .taskCandidateUser(SecurityUtils.getUserId() + "")
                    .taskAssignee(SecurityUtils.getUserId() + "")
                    .endOr();
        }
        result.total(taskQuery.count());
        List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
@@ -306,7 +326,11 @@
            List<String> handlerUnitNames = new ArrayList<>(2);

            // 流程处理人信息
            List<? extends IdentityLinkInfo> identityLinks = task.getIdentityLinks();
            List<IdentityLink> identityLinks = taskService.getIdentityLinksForTask(task.getId());
//            Boolean aboutMe = taskCommonService.taskAboutMe(identityLinks);
//            if (! aboutMe) {
//                continue;
//            }
            for (IdentityLinkInfo identityLink : identityLinks) {
                // 绑定的是用户，查出用户姓名、部门
                if (StringUtils.isNotBlank(identityLink.getUserId())) {
@@ -467,20 +491,25 @@

    @Override
    public Result taskDelegation(TaskDelegationForm form) {
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).includeIdentityLinks().singleResult();
        Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
        if (Objects.isNull(task)) {
            throw new RuntimeException("未在运行任务中找到该任务，无法执行转办操作");
        }
        List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
        // 转办之前的处理人
        List<String> beforeHandlerIds = new ArrayList<>(2);
        // 转办之前的处理人类型
        HandlerTypeEnum beforeHandlerType = null;
        // 需要先移除之前的处理人
        for (IdentityLinkInfo identityLink : task.getIdentityLinks()) {
        for (IdentityLinkInfo identityLink : identityLinksForTask) {
            if (StringUtils.isNotBlank(identityLink.getUserId())) {
                beforeHandlerIds.add(identityLink.getUserId());
                beforeHandlerType = HandlerTypeEnum.USER;
                taskService.deleteCandidateUser(task.getId(), identityLink.getUserId());
                if (IdentityLinkType.ASSIGNEE.equals(identityLink.getType())) {
                    taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), IdentityLinkType.ASSIGNEE);
                } else {
                    taskService.deleteCandidateUser(task.getId(), identityLink.getUserId());
                }
            } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {
                beforeHandlerIds.add(identityLink.getGroupId());
                if (identityLink.getGroupId().contains("dept")) {
@@ -567,73 +596,7 @@
        List<CustomerTaskVO> vos = new ArrayList<>();
        for (Task task : taskList) {
            CustomerTaskVO taskVO = new CustomerTaskVO();
            // 当前流程信息
            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());

            // 流程发起人信息
            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<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
            for (IdentityLink identityLink : identityLinksForTask) {
                // 绑定的是用户，查出用户姓名、部门
                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(Long.parseLong(identityLink.getGroupId()));
                            handlerUnitNames.add(role.getRoleName());
                        }
                    }
                }
                taskVO.setHandlerId(handlerIds);
                taskVO.setHandlerName(handlerNames);
                taskVO.setHandlerUnitId(handlerUnitIds);
                taskVO.setHandlerUnitName(handlerUnitNames);
            }
            this.setRuntimeTaskInfo(task, taskVO);
            vos.add(taskVO);
        }
        result.put("taskList", vos);
@@ -680,7 +643,10 @@
            vo.setDeployId(process.getDeploymentId());
            vo.setTaskName(userTask.getName());
            vo.setProcessName(process.getProcessDefinitionName());
            Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
            Task task = taskService.createTaskQuery()
                    .processInstanceId(process.getId())
                    .taskDefinitionKey(userTask.getId())
                    .singleResult();

            // 一个任务可能有多个候选人/组，所以需要使用list
            List<Long> handlerIds = new ArrayList<>(2);
@@ -744,16 +710,23 @@
                    vo.setTaskId(historicTasks.get(0).getId());
                    vo.setExecutionId(historicTasks.get(0).getExecutionId());
                    vo.setCreateTime(historicTasks.get(0).getStartTime());

                    // 查询实际处理人
                    long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
                    SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
                    if (Objects.nonNull(handlerUser)) {
                        handlerIds.add(handlerUserId);
                        handlerNames.add(handlerUser.getNickName());
                        vo.setActualHandlerUserId(historicTasks.get(0).getAssignee());
                        vo.setActualHandlerUserName(handlerUser.getNickName());
                    }
                    vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
                    this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
                }
                vo.setHandlerId(handlerIds);
                vo.setHandlerName(handlerNames);
                vo.setHandlerUnitId(handlerUnitIds);
                vo.setHandlerUnitName(handlerUnitNames);
            } else {
                vo.setTaskStatus(TaskStatusEnum.TODO);
                vo.setTaskId(task.getId());
@@ -762,11 +735,9 @@
                vo.setTaskDefinitionKey(task.getTaskDefinitionKey());

                this.setPromoterAndHandler(vo, null);
                this.setRuntimeTaskInfo(task, vo);
            }
            vo.setHandlerId(handlerIds);
            vo.setHandlerName(handlerNames);
            vo.setHandlerUnitId(handlerUnitIds);
            vo.setHandlerUnitName(handlerUnitNames);

            return vo;
        }).collect(Collectors.toList());
        result.data(vos);
@@ -809,8 +780,8 @@
            SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
            if (Objects.nonNull(handlerUser)) {

                vo.setHandlerId(Arrays.asList(handlerUserId));
                vo.setHandlerName(Arrays.asList(handlerUser.getNickName()));
                vo.setActualHandlerUserId(hisTaskList.get(0).getAssignee());
                vo.setActualHandlerUserName(handlerUser.getNickName());
            }
            vo.setTaskDefinitionKey(hisTaskList.get(0).getTaskDefinitionKey());
            this.setPromoterAndHandler(vo, hisTaskList.get(0).getIdentityLinks());
@@ -818,6 +789,85 @@
            return vo;
        }).collect(Collectors.toList());
        return vos;
    }

    /**
     * 设置运行时任务的信息
     *
     * @param task 任务
     * @param taskVO 任务vo
     */
    private void setRuntimeTaskInfo(Task task, CustomerTaskVO taskVO) {
        // 当前流程信息
        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());

        // 流程发起人信息
        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<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
        for (IdentityLinkInfo identityLink : identityLinksForTask) {
//            if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
//                continue;
//            }
            // 绑定的是用户，查出用户姓名、部门
            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(Long.parseLong(identityLink.getGroupId()));
                        handlerUnitNames.add(role.getRoleName());
                    }
                }
            }
            taskVO.setHandlerId(handlerIds);
            taskVO.setHandlerName(handlerNames);
            taskVO.setHandlerUnitId(handlerUnitIds);
            taskVO.setHandlerUnitName(handlerUnitNames);
        }
    }

    /**
@@ -871,7 +921,10 @@
            vo.setDeployId(process.getDeploymentId());
            vo.setTaskName(userTask.getName());
            vo.setProcessName(process.getProcessDefinitionName());
            Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
            Task task = taskService.createTaskQuery()
                    .processInstanceId(process.getId())
                    .taskDefinitionKey(userTask.getId())
                    .singleResult();
            if (Objects.isNull(task)) {
                // 如果任务在运行时没找到，那么可能为未开始或者已完成，只查询未开始的
                List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -927,6 +980,8 @@
                } else {
                    continue;
                }
            } else {
                this.setRuntimeTaskInfo(task, vo);
            }
            vos.add(vo);
        }
@@ -979,6 +1034,9 @@
        if (TaskStatusEnum.TODO.equals(taskVO.getTaskStatus())) {
            List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(taskVO.getTaskId());
            for (IdentityLink identityLink : identityLinksForTask) {
                if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
                    continue;
                }
                // 绑定的是用户，查出用户姓名、部门
                if (StringUtils.isNotBlank(identityLink.getUserId())) {
                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
@@ -1021,12 +1079,12 @@
                    taskVO.setHandlerType(HandlerTypeEnum.USER);
                    SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
                    if (Objects.nonNull(sysUser)) {
//                        taskVO.setHandlerId(sysUser.getUserId());
                        handlerIds.add(sysUser.getUserId());
                        handlerNames.add(sysUser.getNickName());
                        if (Objects.nonNull(sysUser.getDept())) {
                            handlerUnitIds.add(sysUser.getDept().getDeptId());
                            handlerUnitNames.add(sysUser.getDept().getDeptName());
                        }
//                        taskVO.setHandlerName(sysUser.getNickName());
                    }
                    // 绑定的是角色，查出角色名称
                } else if (StringUtils.isNotBlank(identityLink.getGroupId())) {

 flowable/src/main/java/com/ycl/common/constant/ProcessConstants.java

@@ -70,6 +70,10 @@
     */
    public static final String PROCESS_INITIATOR = "INITIATOR";

    /**
     * 提交数据方
     */
    public static final String DATA_LAUNCH = "data_launch";

    /**
     * 流程跳过

 flowable/src/main/java/com/ycl/service/common/TaskCommonService.java

@@ -5,10 +5,12 @@
import com.ycl.common.core.domain.entity.SysUser;
import com.ycl.common.enums.FlowComment;
import com.ycl.common.enums.business.TaskStatusEnum;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.domain.entity.SysForm;
import com.ycl.domain.vo.FormDetailVO;
import com.ycl.flow.FindNextNodeUtil;
import com.ycl.service.ISysFormService;
import com.ycl.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.flowable.bpmn.model.*;
import org.flowable.bpmn.model.Process;
@@ -18,6 +20,8 @@
import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.repository.ProcessDefinition;
import org.flowable.identitylink.api.IdentityLink;
import org.flowable.identitylink.api.IdentityLinkType;
import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springframework.stereotype.Service;
@@ -39,6 +43,7 @@
    private final RepositoryService repositoryService;
    private final TaskService taskService;
    private final HistoryService historyService;
    private final ISysUserService sysUserService;

    /**
     * 通过当前节点定义key，获取其上一个节点的信息，如果前面是并行的会返回多个(包含当前节点)
@@ -272,6 +277,7 @@
     * @param taskId             当前任务id
     * @param msg                审核意见
     */
    @Deprecated
    public void reject(String rejectedTaskDefKey, String rejectTaskDefKey, String processInsId, String taskId, String msg) {
        // 驳回的核心api：runtimeService.createChangeActivityStateBuilder().moveXXX 的api，可以设置从当前节点移动到目标节点
        // 驳回的核心：需要找到当前节点、以及要流转到的目标节点。其中比较麻烦的是处理并行等比较复杂的情况
@@ -294,4 +300,21 @@
    }


    /**
     * 获取当前用户的组
     *
     * @return
     */
    public List<String> getCurrentUserGroups() {
        String deptId = "dept:" + SecurityUtils.getLoginUser().getDeptId();
        List<String> roleIds;
        if (CollectionUtils.isEmpty(SecurityUtils.getLoginUser().getUser().getRoles())) {
            roleIds = new ArrayList<>(1);
        } else {
            roleIds = SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId() + "").collect(Collectors.toList());
        }
        roleIds.add(deptId);
        return roleIds;
    }

}

 flowable/src/main/java/com/ycl/service/impl/FlowTaskServiceImpl.java

@@ -151,15 +151,13 @@
        //添加流程变量
        if(!processVariables.isEmpty()) taskService.setVariables(taskId,processVariables);
        taskService.addComment(taskId, task.getProcessInstanceId(), FlowComment.SUBMIT.getType(), "完成提交");
        // 判断当前任务是不是转办过的
        Boolean delegation = flowLogService.taskDelegation(task.getProcessInstanceId(), task.getId());
        if (delegation) {
        if (DelegationState.PENDING.equals(task.getDelegationState())) {
            taskService.resolveTask(taskId, newV);
        } else {
            // 先让当前用户认领这个任务
            taskService.claim(taskId, SecurityUtils.getUserId() + "");
            taskService.complete(taskId, newV);
        }
        // 先让当前用户认领这个任务
        taskService.claim(taskId, SecurityUtils.getUserId() + "");
        taskService.complete(taskId, newV);

        return AjaxResult.success("提交成功");
    }

@@ -1301,10 +1299,16 @@
                List<JSONObject> oldFields = JSON.parseObject(JSON.toJSONString(formJson.get(ProcessConstants.WIDGET_LIST)), new TypeReference<List<JSONObject>>() {
                });

                // 设置已填写的表单为禁用状态
                for (JSONObject oldField : oldFields) {
                    JSONObject options = oldField.getJSONObject("options");
                    options.put("disabled", true);
                if(CollectionUtils.isNotEmpty(oldFields)) {
                    // 设置已填写的表单为禁用状态
                    for (JSONObject oldField : oldFields) {
                        JSONObject options = oldField.getJSONObject("options");
                        options.put("disabled", true);
                    }
                    formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
                    newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
                    newP.remove(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
                    formDetailVO.setFormJsonObj(newP);
                }
                // TODO 暂时只处理用户任务上的表单
//                if (StringUtils.isNotBlank(task.getFormKey())) {
@@ -1324,10 +1328,7 @@
//                    }
//                    oldFields.addAll(newFields);
//                }
                formJson.put(ProcessConstants.WIDGET_LIST, oldFields);
                newP.put(ProcessConstants.TASK_FORM_KEY, formJson);
                newP.remove(formDetailVO.getBeforeNodeDefId() + "&" + ProcessConstants.TASK_FORM_KEY);
                formDetailVO.setFormJsonObj(newP);

            }
        }
        return beforeNodes;

 system/src/main/java/com/ycl/framework/config/SecurityConfig.java

@@ -115,6 +115,7 @@
                // 静态资源，可匿名访问
                .antMatchers(HttpMethod.GET, "/flowable-ui", "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                .antMatchers("/common/upload").permitAll()
                // 除上面外的所有请求全部需要鉴权认证
                .anyRequest().authenticated()
                .and()