zhanghua
2024-11-30 3003d08559062e83622c93003380efb0daaca132
流程待办跳转
4个文件已修改
42 ■■■■ 已修改文件
business/src/main/java/com/ycl/controller/ProjectProcessController.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/domain/query/TaskQuery.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/ProjectProcessService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -85,5 +85,12 @@
        return result;
    }
    @GetMapping("/detail-by-process_ins_id")
    @ApiOperation(value = "获取详情", notes = "获取详情")
//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
    public Result detailByProcessInsId(TaskQuery query) {
        return projectProcessService.detailByProcessInsId(query);
    }
}
business/src/main/java/com/ycl/domain/query/TaskQuery.java
@@ -21,6 +21,10 @@
    private String processDefId;
    /**
     * 流程实例id
     */
    private String processInsId;
    /**
     * 任务名称
     */
    private String taskName;
business/src/main/java/com/ycl/service/ProjectProcessService.java
@@ -67,4 +67,6 @@
     * @param result
     */
    void getAllTodoTask(String taskName, int pageSize, int pageNum, Result result);
    Result detailByProcessInsId(TaskQuery query);
}
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -78,6 +78,7 @@
    /**
     * 分页查询
     *
     * @param query
     * @return
     */
@@ -164,6 +165,7 @@
    /**
     * 获取流程详情
     *
     * @param projectId
     * @return
     */
@@ -204,7 +206,7 @@
        Result result = Result.ok();
        // 代办任务
        this.getTodoTaskList(projectProcess.getProcessInsId(),"", 5, 1, result);
        this.getTodoTaskList(projectProcess.getProcessInsId(), "", 5, 1, result);
        return result.data(detail);
    }
@@ -221,16 +223,16 @@
        Result ok = Result.ok();
        switch (query.getTaskType()) {
            case TaskTypeConstant.ALL:
                this.getAllUserTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName (), (int)query.getCurrentPage(), (int)query.getPageSize(), ok);
                this.getAllUserTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            case TaskTypeConstant.TODO:
                this.getTodoTaskList(projectProcess.getProcessInsId(), query.getTaskName(), (int)query.getPageSize(), (int)query.getCurrentPage(), ok);
                this.getTodoTaskList(projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getPageSize(), (int) query.getCurrentPage(), ok);
                ok.data(ok.get("taskList"));
                break;
            case TaskTypeConstant.CURRENT:
                break;
            case TaskTypeConstant.REMAINING:
                this.getRemainingTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName (), (int)query.getCurrentPage(), (int)query.getPageSize(), ok);
                this.getRemainingTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
                break;
            default:
                break;
@@ -306,6 +308,15 @@
            vos.add(taskVO);
        }
        result.put("taskList", vos);
    }
    @Override
    public Result detailByProcessInsId(com.ycl.domain.query.TaskQuery query) {
        List<ProjectProcess> list = new LambdaQueryChainWrapper<>(baseMapper)
                .eq(ProjectProcess::getProcessInsId, query.getProcessInsId())
                .eq(ProjectProcess::getProcessDefId, query.getProcessDefId())
                .list();
        return Result.ok().data(list);
    }
    /**
@@ -404,7 +415,7 @@
     * 获取所有任务
     *
     * @param processDefinitionId 流程运行id
     * @param processInsId 流程实例id
     * @param processInsId        流程实例id
     * @param pageNum
     * @param pageSize
     * @param result
@@ -601,7 +612,7 @@
     * 查询剩余事项(未开始的任务)数量
     *
     * @param processDefinitionId 流程定义id
     * @param processInsId 流程实例id
     * @param processInsId        流程实例id
     * @return
     */
    private Long getRemainingTaskNum(String processDefinitionId, String processInsId) {
@@ -686,7 +697,7 @@
                    }
                }
            }
        } else if (TaskStatusEnum.FINISHED.equals(taskVO.getTaskStatus())){
        } else if (TaskStatusEnum.FINISHED.equals(taskVO.getTaskStatus())) {
            for (IdentityLinkInfo identityLink : identityLinkInfos) {
                // 绑定的是用户,查出用户姓名、部门
                if (StringUtils.isNotBlank(identityLink.getUserId())) {
@@ -763,7 +774,7 @@
    /**
     * 获取流程节点数(总任务数,不包含开始、结束等特殊的,只统计UserTask类型的)
     *
     * @param processDefinitionId  流程定义id
     * @param processDefinitionId 流程定义id
     * @return
     */
    private Long getTotalTaskNum(String processDefinitionId) {
@@ -797,6 +808,6 @@
     * @return
     */
    private List<Task> getCurrentNodeTaskList(String processInstanceId) {
       return taskService.createTaskQuery().processDefinitionId(processInstanceId).list();
        return taskService.createTaskQuery().processDefinitionId(processInstanceId).list();
    }
}