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


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


import com.alibaba.fastjson2.TypeReference;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;


import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.ycl.common.base.Result;


import com.ycl.common.constant.ProcessConstants;


@@ -24,8 +25,10 @@


import com.ycl.domain.dto.FlowTaskDto;


import com.ycl.domain.dto.FlowViewerDto;


import com.ycl.domain.entity.ProcessCoding;


import com.ycl.domain.entity.ProcessLog;


import com.ycl.domain.entity.ProjectProcess;


import com.ycl.domain.entity.SysForm;


import com.ycl.domain.form.EditFinishedTaskForm;


import com.ycl.domain.json.RejectData;


import com.ycl.domain.query.ProcessLogQuery;


import com.ycl.domain.vo.*;


@@ -71,7 +74,6 @@


import org.flowable.task.api.history.HistoricTaskInstanceQuery;


import org.springframework.beans.BeanUtils;


import org.springframework.context.ApplicationEventPublisher;


import org.springframework.context.annotation.Bean;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




@@ -189,6 +191,7 @@


        }


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


    }






    /**


     * 容缺补交


@@ -329,8 +332,18 @@


        if (taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult().isSuspended()) {


            throw new CustomException("任务处于挂起状态!");


        }




        // 当前任务 task


        Task task = taskService.createTaskQuery().taskId(flowTaskVo.getTaskId()).singleResult();




        ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)


                .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())


                .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())


                .one();


        if (Objects.isNull(projectProcess)) {


            throw new CustomException("项目流程未绑定");


        }




        // 获取流程定义信息


        ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(task.getProcessDefinitionId()).singleResult();


        // 获取所有节点信息


@@ -423,6 +436,21 @@


        try {


            // 如果父级任务多于 1 个，说明当前节点不是并行节点，原因为不考虑多对多情况


            if (targetIds.size() > 1) {


                // 删除被驳回任务的所有日志


                for (String targetId : targetIds) {


                    List<HistoricTaskInstance> rejectHisTaskList = historyService.createHistoricTaskInstanceQuery()


                            .taskDefinitionKey(targetId)


                            .processInstanceId(projectProcess.getProcessInsId())


                            .orderByHistoricTaskInstanceStartTime()


                            .desc()


                            .list();


                    if (CollectionUtils.isNotEmpty(rejectHisTaskList)) {


                        new LambdaUpdateChainWrapper<>(processLogService.getBaseMapper())


                                .eq(ProcessLog::getTaskId, rejectHisTaskList.get(0).getId())


                                .eq(ProcessLog::getProcessInsId, projectProcess.getProcessInsId())


                                .remove();


                    }


                }


                // 1 对 多任务跳转，currentIds 当前节点(1)，targetIds 跳转到的节点(多)


                runtimeService.createChangeActivityStateBuilder()


                        .processInstanceId(task.getProcessInstanceId()).


@@ -430,22 +458,30 @@


            }


            // 如果父级任务只有一个，因此当前任务可能为网关中的任务


            if (targetIds.size() == 1) {


                // 删除被驳回任务的所有日志


                List<HistoricTaskInstance> rejectHisTaskList = historyService.createHistoricTaskInstanceQuery()


                        .taskDefinitionKey(targetIds.get(0))


                        .processInstanceId(projectProcess.getProcessInsId())


                        .orderByHistoricTaskInstanceStartTime()


                        .desc()


                        .list();


                if (CollectionUtils.isNotEmpty(rejectHisTaskList)) {


                    new LambdaUpdateChainWrapper<>(processLogService.getBaseMapper())


                            .eq(ProcessLog::getTaskId, rejectHisTaskList.get(0).getId())


                            .eq(ProcessLog::getProcessInsId, projectProcess.getProcessInsId())


                            .remove();


                }




                // 1 对 1 或 多 对 1 情况，currentIds 当前要跳转的节点列表(1或多)，targetIds.get(0) 跳转到的节点(1)


                runtimeService.createChangeActivityStateBuilder()


                        .processInstanceId(task.getProcessInstanceId())


                        .moveActivityIdsToSingleActivityId(currentIds, targetIds.get(0)).changeState();


            }


            historyService.deleteHistoricTaskInstance(flowTaskVo.getTaskId());


        } catch (FlowableObjectNotFoundException e) {


            throw new CustomException("未找到流程实例，流程可能已发生变化");


        } catch (FlowableException e) {


            throw new CustomException("无法取消或开始活动");


        }


        ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)


                .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())


                .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())


                .one();


        if (Objects.isNull(projectProcess)) {


            throw new CustomException("项目流程未绑定");


        }


        // 保存日志


        publisher.publishEvent(new TaskLogEvent(this, null,


@@ -978,17 +1014,17 @@


    public AjaxResult flowRecord(String procInsId) {


        Map<String, Object> map = new HashMap<String, Object>();


        if (StringUtils.isNotBlank(procInsId)) {


            List<HistoricActivityInstance> list = historyService


                    .createHistoricActivityInstanceQuery()


            List<HistoricTaskInstance> list = historyService


                    .createHistoricTaskInstanceQuery()


                    .processInstanceId(procInsId)


                    .orderByHistoricActivityInstanceStartTime()


                    .orderByHistoricTaskInstanceStartTime()


                    .desc().list();


            //扩展 获取这个流程实例的监控信息 key:TaskId value:实体类


            Map<String, ProcessCoding> processCodingMap = processCodingMapper.selectList(new QueryWrapper<ProcessCoding>().eq("process_ins_id", procInsId))


                    .stream()


                    .collect(Collectors.toMap(ProcessCoding::getTaskId, Function.identity()));


            List<FlowTaskDto> hisFlowList = new ArrayList<>();


            for (HistoricActivityInstance histIns : list) {


            for (HistoricTaskInstance histIns : list) {


                // 展示开始节点


//                if ("startEvent".equals(histIns.getActivityType())) {


//                    FlowTaskDto flowTask = new FlowTaskDto();


@@ -1006,10 +1042,10 @@


//                    flowTask.setFinishTime(histIns.getEndTime());


//                    hisFlowList.add(flowTask);


//                } else


                if (StringUtils.isNotBlank(histIns.getTaskId())) {


                if (StringUtils.isNotBlank(histIns.getId())) {


                    FlowTaskDto flowTask = new FlowTaskDto();


                    flowTask.setTaskId(histIns.getTaskId());


                    flowTask.setTaskName(histIns.getActivityName());


                    flowTask.setTaskId(histIns.getId());


                    flowTask.setTaskName(histIns.getName());


                    flowTask.setCreateTime(histIns.getStartTime());


                    flowTask.setFinishTime(histIns.getEndTime());


                    if (StringUtils.isNotBlank(histIns.getAssignee())) {


@@ -1019,7 +1055,7 @@


                        flowTask.setDeptName(Objects.nonNull(sysUser.getDept()) ? sysUser.getDept().getDeptName() : "");


                    }


                    // 展示审批人员


                    List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getTaskId());


                    List<HistoricIdentityLink> linksForTask = historyService.getHistoricIdentityLinksForTask(histIns.getId());


                    StringBuilder stringBuilder = new StringBuilder();


                    for (HistoricIdentityLink identityLink : linksForTask) {


                        // 获选人,候选组/角色(多个)


@@ -1046,7 +1082,7 @@




                    flowTask.setDuration(histIns.getDurationInMillis() == null || histIns.getDurationInMillis() == 0 ? null : getDate(histIns.getDurationInMillis()));


                    //扩展 判断是否超时


                    ProcessCoding processCoding = processCodingMap.get(histIns.getTaskId());


                    ProcessCoding processCoding = processCodingMap.get(histIns.getId());


                    if (processCoding != null) {


                        //通过耗时判断是否是代办节点


                        //如果任务是代办节点


@@ -1065,7 +1101,7 @@


                    // 获取意见评论内容


                    List<Comment> commentList = taskService.getProcessInstanceComments(histIns.getProcessInstanceId());


                    commentList.forEach(comment -> {


                        if (histIns.getTaskId().equals(comment.getTaskId())) {


                        if (histIns.getId().equals(comment.getTaskId())) {


                            flowTask.setComment(FlowCommentDto.builder().type(comment.getType()).comment(comment.getFullMessage()).build());


                        }


                    });


@@ -1314,6 +1350,7 @@


                    .processInstanceId(procInsId)


                    .finished()


                    .list();


            listFinished = this.distinctHisActivity(listFinished);




            //扩展 获取这个流程实例的监控信息 key:TaskId value:实体类


            Map<String, ProcessCoding> processCodingMap = new LambdaQueryChainWrapper<>(processCodingMapper)


@@ -1377,6 +1414,99 @@


    }




    /**


     * 根据任务key去重历史任务，相同情况下取最新的一条


     *


     * @param hisTaskList


     * @return


     */


    private List<HistoricActivityInstance> distinctHisActivity(List<HistoricActivityInstance> hisTaskList) {


        Map<String, HistoricActivityInstance> uniqueTasks = new HashMap<>();


        for (HistoricActivityInstance task : hisTaskList) {


            String taskDefinitionKey = task.getActivityId();


            HistoricActivityInstance existingTask = uniqueTasks.get(taskDefinitionKey);




            // 如果任务key重复（可能被驳回过，重新提交导致key重复），取最近的一条


            if (existingTask == null || task.getStartTime().after(existingTask.getStartTime())) {


                uniqueTasks.put(taskDefinitionKey, task);


            }


        }


        // 最终去重后的任务列表


        return new ArrayList<>(uniqueTasks.values());


    }




    /**


     * 查询当前任务的表单数据


     *


     * @param taskId


     * @return


     * @throws Exception


     */


    @Override


    public AjaxResult currentFlowTaskForm(String taskId) {


        // 流程变量


        List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()


                .finished()


                .taskId(taskId)


                .orderByHistoricTaskInstanceStartTime()


                .desc()


                .list();


        if (CollectionUtils.isEmpty(hisTaskList) || Objects.isNull(hisTaskList.get(0))) {


            return AjaxResult.error("未找到该任务信息");


        }


        HistoricTaskInstance historicTaskInstance = hisTaskList.get(0);


        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(historicTaskInstance.getProcessInstanceId()).singleResult();


        Map<String, Object> parameters = new HashMap<>();


        if (Objects.nonNull(processInstance)) {


            parameters = processInstance.getProcessVariables();


        } else {


            // 如果为空，表明流程已经结束


            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables().processInstanceId(historicTaskInstance.getProcessInstanceId()).singleResult();


            if (Objects.isNull(historicProcessInstance)) {


                throw new RuntimeException("流程不存在");


            }


            parameters = historicProcessInstance.getProcessVariables();


        }




        String processInsId = historicTaskInstance.getProcessInstanceId();


        List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters,


                historicTaskInstance.getFormKey(),


                historicTaskInstance.getName(),


                historicTaskInstance.getProcessDefinitionId(),


                historicTaskInstance.getTaskDefinitionKey(),


                Boolean.TRUE, Boolean.FALSE);






        String finalProcessInsId = processInsId;


        List<DoFormDetailVO> vos = beforeNodes.stream()


                .filter(FormDetailVO::getCurrent)


                .map(node -> {


                    // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来


                    ProcessLogQuery query = new ProcessLogQuery();


                    query.setTaskId(taskId);


                    query.setProcessInsId(finalProcessInsId);


                    Result result = processLogService.projectProcessLogList(query);


                    List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");


                    DoFormDetailVO vo = new DoFormDetailVO();


                    BeanUtils.copyProperties(node, vo);


                    if (CollectionUtils.isNotEmpty(logList)) {


                        vo.setEvents(logList);


                    }


                    // 根据日志判断当前任务的状态


                    if (logList.stream().anyMatch(log -> ProcessLogEventTypeEnum.FINISHED.equals(log.getEventType()))) {


                        vo.setTaskStatus(TaskStatusEnum.FINISHED);


                    } else if (logList.stream().anyMatch(log -> ProcessLogEventTypeEnum.JUMP.equals(log.getEventType()))) {


                        vo.setTaskStatus(TaskStatusEnum.JUMP);


                    } else if (processLogService.taskIsWait(taskId, processInsId)) {


                        vo.setTaskStatus(TaskStatusEnum.WAIT);


                    } else if (processLogService.taskIsHangup(taskId, processInsId)) {


                        vo.setTaskStatus(TaskStatusEnum.HANGUP);


                    }


                    return vo;


        }).collect(Collectors.toList());


        return AjaxResult.success(vos.get(0));


    }




    /**


     * 流程节点表单


     *


     * @param taskId 流程任务编号


@@ -1385,20 +1515,55 @@


    @Override


    public AjaxResult flowTaskForm(String taskId) throws Exception {


        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();


        // 流程变量


        Map<String, Object> parameters = new HashMap<>();


        List<FormDetailVO> beforeNodes = new ArrayList<>();


        // 1. 获取到变量信息，因为任务可能是运行中的也可能是历史任务


        String processInsId = "";


        HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().includeProcessVariables().finished().taskId(taskId).singleResult();


        if (Objects.nonNull(historicTaskInstance)) {


            parameters = historicTaskInstance.getProcessVariables();


            processInsId = historicTaskInstance.getProcessInstanceId();


            beforeNodes = this.getBeforeNodeForm(parameters, historicTaskInstance.getFormKey(), historicTaskInstance.getName(), historicTaskInstance.getProcessDefinitionId(), historicTaskInstance.getTaskDefinitionKey(), Boolean.FALSE);


        String processDefId = "";


        String formKey = "";


        String taskName = "";


        String taskDefKey = "";


        if (Objects.isNull(task)) {


            List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()


                    .finished()


                    .taskId(taskId)


                    .orderByHistoricTaskInstanceStartTime()


                    .desc()


                    .list();


            if (CollectionUtils.isEmpty(hisTaskList) || Objects.isNull(hisTaskList.get(0))) {


                return AjaxResult.error("任务不存在");


            }


            HistoricTaskInstance hisTask = hisTaskList.get(0);


            processInsId = hisTask.getProcessInstanceId();


            processDefId = hisTask.getProcessDefinitionId();


            formKey = hisTask.getFormKey();


            taskName = hisTask.getName();


            taskDefKey = hisTask.getTaskDefinitionKey();


        } else {


            parameters = taskService.getVariables(taskId);


            processInsId = task.getProcessInstanceId();


            beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.FALSE);


            processDefId = task.getProcessDefinitionId();


            formKey = task.getFormKey();


            taskName = task.getName();


            taskDefKey = task.getTaskDefinitionKey();


        }


        // 2. 获取流程变量


        ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();


        Map<String, Object> parameters = new HashMap<>();


        if (Objects.nonNull(processInstance)) {


            parameters = processInstance.getProcessVariables();


        } else {


            // 如果为空，表明流程已经结束


            HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery().includeProcessVariables().processInstanceId(processInsId).singleResult();


            if (Objects.isNull(historicProcessInstance)) {


                throw new RuntimeException("流程不存在");


            }


            parameters = historicProcessInstance.getProcessVariables();


        }


        List<FormDetailVO> beforeNodes = new ArrayList<>();


        beforeNodes = this.getBeforeNodeForm(parameters,


                formKey,


                taskName,


                processDefId,


                taskDefKey,


                Boolean.TRUE, Boolean.FALSE);


        // 判断前置任务是不是和当前任务为同一个executeId


        // 判断当前任务是否被挂起中


        String finalProcessInsId = processInsId;


@@ -1406,6 +1571,7 @@


        Map<String, List<FormDetailVO>> map = new HashMap<>(2);


        beforeNodes.stream().forEach(node -> {


            if (node.getCurrent()) {


                node.setTaskId(taskId);


                dataList.add(node);


            } else {


                List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()


@@ -1416,6 +1582,7 @@


                        .desc()


                        .list();


                if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {


                    node.setTaskId(beforeTasks.get(0).getId());


                    List<FormDetailVO> l = map.get(beforeTasks.get(0));


                    if (CollectionUtils.isEmpty(l)) {


                        map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));


@@ -1439,9 +1606,9 @@


            }


            // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来


            ProcessLogQuery query = new ProcessLogQuery();


            query.setTaskDefKey(node.getUserTask().getId());


            query.setTaskId(node.getTaskId());


            query.setProcessInsId(finalProcessInsId);


            Result result = processLogService.projectProcessLogPage(query);


            Result result = processLogService.projectProcessLogList(query);


            List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");


            DoFormDetailVO vo = new DoFormDetailVO();


            BeanUtils.copyProperties(node, vo);


@@ -1478,11 +1645,17 @@


            }


            HistoricTaskInstance hisTask = hisTasks.get(0);


            parameters = historicProcessInstance.getProcessVariables();


            List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);


            List<FormDetailVO> beforeNodes = this.getBeforeNodeForm(parameters,


                    hisTask.getFormKey(),


                    hisTask.getName(),


                    hisTask.getProcessDefinitionId(),


                    hisTask.getTaskDefinitionKey(),


                    Boolean.TRUE, Boolean.TRUE);


            List<FormDetailVO> dataList = new ArrayList<>(2);


            Map<String, List<FormDetailVO>> map = new HashMap<>(2);


            beforeNodes.stream().forEach(node -> {


                if (node.getCurrent()) {


                    node.setTaskId(taskId);


                    dataList.add(node);


                } else {


                    List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()


@@ -1493,6 +1666,7 @@


                            .desc()


                            .list();


                    if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {


                        node.setTaskId(beforeTasks.get(0).getId());


                        List<FormDetailVO> l = map.get(beforeTasks.get(0));


                        if (CollectionUtils.isEmpty(l)) {


                            map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));


@@ -1516,9 +1690,9 @@


                }


                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来


                ProcessLogQuery query = new ProcessLogQuery();


                query.setTaskDefKey(node.getUserTask().getId());


                query.setTaskId(node.getTaskId());


                query.setProcessInsId(hisTask.getProcessInstanceId());


                Result result = processLogService.projectProcessLogPage(query);


                Result result = processLogService.projectProcessLogList(query);


                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");


                DoFormDetailVO vo = new DoFormDetailVO();


                BeanUtils.copyProperties(node, vo);


@@ -1533,7 +1707,12 @@


            Task task = taskService.createTaskQuery().taskId(taskId).processInstanceId(processInsId).singleResult();


            List<FormDetailVO> beforeNodes = new ArrayList<>();


            if (Objects.nonNull(task)) {


                beforeNodes = this.getBeforeNodeForm(parameters, task.getFormKey(), task.getName(), task.getProcessDefinitionId(), task.getTaskDefinitionKey(), Boolean.TRUE);


                beforeNodes = this.getBeforeNodeForm(parameters,


                        task.getFormKey(),


                        task.getName(),


                        task.getProcessDefinitionId(),


                        task.getTaskDefinitionKey(),


                        Boolean.TRUE, Boolean.TRUE);


            } else {


                List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()


                        .taskId(taskId)


@@ -1546,12 +1725,18 @@


                    throw new RuntimeException("该任务不存在");


                }


                HistoricTaskInstance hisTask = hisTasks.get(0);


                beforeNodes = this.getBeforeNodeForm(parameters, hisTask.getFormKey(), hisTask.getName(), hisTask.getProcessDefinitionId(), hisTask.getTaskDefinitionKey(), Boolean.TRUE);


                beforeNodes = this.getBeforeNodeForm(parameters,


                        hisTask.getFormKey(),


                        hisTask.getName(),


                        hisTask.getProcessDefinitionId(),


                        hisTask.getTaskDefinitionKey(),


                        Boolean.TRUE, Boolean.TRUE);


            }


            List<FormDetailVO> dataList = new ArrayList<>(2);


            Map<String, List<FormDetailVO>> map = new HashMap<>(2);


            beforeNodes.stream().forEach(node -> {


                if (node.getCurrent()) {


                    node.setTaskId(taskId);


                    dataList.add(node);


                } else {


                    List<HistoricTaskInstance> beforeTasks = historyService.createHistoricTaskInstanceQuery()


@@ -1562,6 +1747,7 @@


                            .desc()


                            .list();


                    if (CollectionUtils.isNotEmpty(beforeTasks) && Objects.nonNull(beforeTasks.get(0))) {


                        node.setTaskId(beforeTasks.get(0).getId());


                        List<FormDetailVO> l = map.get(beforeTasks.get(0));


                        if (CollectionUtils.isEmpty(l)) {


                            map.put(beforeTasks.get(0).getExecutionId(), Arrays.asList(node));


@@ -1585,9 +1771,9 @@


                }


                // 判断任务是否存在特殊操作(如跳过、转办等)，需要在前端展示出来


                ProcessLogQuery query = new ProcessLogQuery();


                query.setTaskDefKey(node.getUserTask().getId());


                query.setTaskId(node.getTaskId());


                query.setProcessInsId(processInsId);


                Result result = processLogService.projectProcessLogPage(query);


                Result result = processLogService.projectProcessLogList(query);


                List<ProcessLogVO> logList = (List<ProcessLogVO>) result.get("data");


                DoFormDetailVO vo = new DoFormDetailVO();


                BeanUtils.copyProperties(node, vo);


@@ -1608,9 +1794,16 @@


     * @param taskName      任务


     * @param processDefId  流程定义id


     * @param processDefKey 流程实例id


     * @param disableInput 是否禁用已经有值的输入项


     * @return


     */


    private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters, String formKey, String taskName, String processDefId, String processDefKey, Boolean currentNeedData) {


    private List<FormDetailVO> getBeforeNodeForm(Map<String, Object> parameters,


                                                 String formKey,


                                                 String taskName,


                                                 String processDefId,


                                                 String processDefKey,


                                                 Boolean currentNeedData,


                                                 Boolean disableInput) {




        // 这里只需要查自身以及上一个节点(如果并行的有多个)的表单数据


        List<FormDetailVO> beforeNodes = taskCommonService.getBeforeNodeDefInfo(processDefId, processDefKey, sysFormService, Boolean.TRUE);


@@ -1644,9 +1837,11 @@




                if(CollectionUtils.isNotEmpty(oldFields)) {


                    // 设置已填写的表单为禁用状态


                    for (JSONObject oldField : oldFields) {


                        JSONObject options = oldField.getJSONObject("options");


                        options.put("disabled", true);


                    if (disableInput) {


                        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);


@@ -1677,6 +1872,7 @@


        return beforeNodes;


    }






    /**


     * 流程节点信息


     *