Merge remote-tracking branch 'origin/master'

fuliqi

2025-01-20 9e28453dba6ecf93c6c2234ba38def7c41cf12f0

 flowable/src/main/java/com/ycl/controller/FlowTaskController.java

@@ -75,8 +75,8 @@

    @ApiOperation(value = "流程历史流转记录", response = FlowTaskDto.class)
    @GetMapping(value = "/flowRecord")
    public AjaxResult flowRecord(String procInsId, String deployId) {
        return flowTaskService.flowRecord(procInsId, deployId);
    public AjaxResult flowRecord(String procInsId) {
        return flowTaskService.flowRecord(procInsId);
    }

    @ApiOperation(value = "根据任务ID查询挂载的表单信息")
@@ -258,13 +258,13 @@
    /**
     * 流程节点信息
     *
     * @param procInsId 流程实例id
     * @param processInsId 流程实例id
     * @return
     */
    @GetMapping("/flowXmlAndNode")
    public AjaxResult flowXmlAndNode(@RequestParam(value = "procInsId", required = false) String procInsId,
    public AjaxResult flowXmlAndNode(@RequestParam(value = "processInsId", required = false) String processInsId,
                                     @RequestParam(value = "deployId", required = false) String deployId) {
        return flowTaskService.flowXmlAndNode(procInsId, deployId);
        return flowTaskService.flowXmlAndNode(processInsId, deployId);
    }

    /**