业主单位表达式处理逻辑调整

xiangpei

2025-02-11 3659ccadb8b4e58dd654c151b95bd91d110b8327

业主单位表达式处理逻辑调整

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

@@ -211,7 +211,7 @@
        //测试容缺
        variables.put("miss",true);
        // 将该项目的申请人（业主方）作为流程中某些环节的处理人
        variables.put(ProcessConstants.DATA_LAUNCH, createBy);
        variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
        return processInstance.getId();
    }
@@ -740,24 +740,25 @@
                    // 未开始的任务，其关联的用户组这些都可以从UserTask中拿到，因为本身未开始的任务是没有task的，所以这里直接查
                    if (StringUtils.isNotBlank(userTask.getAssignee())) {
                        vo.setHandlerType(HandlerTypeEnum.USER);
                        // 处理变量表达式
                        if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
                            this.varReview(vo, projectId, processInsId);
                        } else {
                            SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                            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());
                                }
                        SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                        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 (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
                        List<String> groupIds = userTask.getCandidateGroups();
                        for (String groupId : groupIds) {
                            if (groupId.startsWith("dept")) {   // 部门的id是加了前缀的如：dept:1
                            // 处理变量表达式，DATA_LAUNCH只可能是部门不会是角色，因为代表的是业主部门
                            if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
                                vo.setHandlerType(HandlerTypeEnum.DEPT);
                                this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
                            }
                            else if (groupId.startsWith("dept")) {   // 部门的id是加了前缀的如：dept:1
                                vo.setHandlerType(HandlerTypeEnum.DEPT);
                                String[] split = groupId.split(":");
                                if (split.length > 1) {
@@ -766,7 +767,6 @@
                                    if (Objects.nonNull(dept)) {
                                        handlerUnitIds.add(dept.getDeptId());
                                        handlerUnitNames.add(dept.getDeptName());

                                    }
                                }
                            } else {
@@ -911,16 +911,13 @@
        // 流程处理人信息
        List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
        for (IdentityLinkInfo identityLink : identityLinksForTask) {
//            if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
//                continue;
//            }
            // 绑定的是用户，查出用户姓名、部门
            if (StringUtils.isNotBlank(identityLink.getUserId())) {
                // 处理变量表达式
                if (identityLink.getUserId().contains(ProcessConstants.DATA_LAUNCH)) {
                    this.varReview(taskVO, projectId, task.getProcessInstanceId());
                    continue;
                }
                // 处理变量表达式，运行中的任务无需再处理表达式了，flowable已经自动根据变量设置了
//                if (identityLink.getUserId().contains(ProcessConstants.DATA_LAUNCH)) {
//                    this.varReview(taskVO, projectId, task.getProcessInstanceId());
//                    continue;
//                }
                taskVO.setHandlerType(HandlerTypeEnum.USER);
                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
                if (Objects.nonNull(sysUser)) {
@@ -1398,13 +1395,6 @@
            // 未开始的任务，其关联的用户组这些都可以从UserTask中拿到，因为本身未开始的任务是没有task的，所以这里直接查
            if (StringUtils.isNotBlank(userTask.getAssignee())) {
                vo.setHandlerType(HandlerTypeEnum.USER);

                // 处理变量表达式
                if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
                    this.varReview(vo, projectId, processInsId);
                    vos.add(vo);
                    continue;
                }
                SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
                if (Objects.nonNull(sysUser)) {
                    vo.getHandlerId().add(sysUser.getUserId());
@@ -1417,7 +1407,12 @@
            } else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
                List<String> groupIds = userTask.getCandidateGroups();
                for (String groupId : groupIds) {
                    if (groupId.startsWith("dept")) {   // 部门的id是加了前缀的如：dept:1
                    // 处理变量表达式，DATA_LAUNCH只可能是部门不会是角色，因为代表的是业主部门
                    if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
                        vo.setHandlerType(HandlerTypeEnum.DEPT);
                        this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
                    }
                    else if (groupId.startsWith("dept")) {   // 部门的id是加了前缀的如：dept:1
                        vo.setHandlerType(HandlerTypeEnum.DEPT);
                        String[] split = groupId.split(":");
                        if (split.length > 1) {
@@ -1458,11 +1453,11 @@
    }

    /**
     * 处理流程变量的处理人回显
     * 处理流程变量-业主单位
     *
     * @param vo
     */
    private void varReview(CustomerTaskVO vo, Long projectId, String processInsId) {
    private void varYzReview(CustomerTaskVO vo, Long projectId, String processInsId, HandlerTypeEnum type) {
        ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
                .eq(ProjectProcess::getProjectId, projectId)
                .eq(ProjectProcess::getProcessInsId, processInsId)
@@ -1470,11 +1465,26 @@
        if (Objects.isNull(projectProcess)) {
            throw new RuntimeException("该流程未绑定项目");
        }
        SysUser user = sysUserService.selectUserById(projectProcess.getDataLaunch());
        if (Objects.nonNull(user) && Objects.nonNull(user.getDept())) {
            vo.getHandlerName().add(user.getDept().getDeptName());
            vo.getHandlerId().add(user.getDept().getDeptId());
        if (HandlerTypeEnum.USER.equals(type) || HandlerTypeEnum.FIX_USER.equals(type)) {
            SysUser user = sysUserService.selectUserById(projectProcess.getDataLaunch());
            if (Objects.nonNull(user) && Objects.nonNull(user.getDept())) {
                vo.getHandlerName().add(user.getNickName());
                vo.getHandlerId().add(user.getUserId());
            }
        } else if (HandlerTypeEnum.DEPT.equals(type)) {
            SysDept dept = deptService.selectDeptById(projectProcess.getDataLaunch());
            if (Objects.nonNull(dept)) {
                vo.getHandlerUnitId().add(dept.getDeptId());
                vo.getHandlerUnitName().add(dept.getDeptName());
            }
        } else if (HandlerTypeEnum.ROLE.equals(type)) {
            SysRole role = sysRoleService.selectRoleById(projectProcess.getDataLaunch());
            if (Objects.nonNull(role)) {
                vo.getHandlerUnitId().add(role.getRoleId());
                vo.getHandlerUnitName().add(role.getRoleName());
            }
        }

        this.distinctVo(vo);
    }