注释task上报、废除中flow相关的代码

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -424,23 +424,23 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
     @Override
     public Boolean abolishTask(Task task) {
         //查询分支
-        List<TaskParallel> linkList = this.taskParallelService.list(Wrappers.<TaskParallel>lambdaQuery().eq(TaskParallel::getProcessInstanceId, task.getProcessInstanceId()));
-
-        //将所有分支流程执行结束
-        for (TaskParallel taskParallel : linkList) {
-            //根据实例ID获取任务ID
-            String linkTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(taskParallel.getParallelProcessInstanceId());
-            if (StringUtils.isNotEmpty(linkTaskId)) {
-                //结束分支流程
-                this.newFlowClient.completeApprovalTask(linkTaskId, taskParallel.getParallelProcessInstanceId(), "上报人主动废除");
-            }
-        }
-        //获取主流程的任务ID
-        String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(task.getProcessInstanceId());
-        if (StringUtils.isNotEmpty(masterTaskId)) {
-            //结束主流程
-            this.newFlowClient.completeApprovalTask(masterTaskId, task.getProcessInstanceId(), "上报人主动废除");
-        }
+//        List<TaskParallel> linkList = this.taskParallelService.list(Wrappers.<TaskParallel>lambdaQuery().eq(TaskParallel::getProcessInstanceId, task.getProcessInstanceId()));
+//
+//        //将所有分支流程执行结束
+//        for (TaskParallel taskParallel : linkList) {
+//            //根据实例ID获取任务ID
+//            String linkTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(taskParallel.getParallelProcessInstanceId());
+//            if (StringUtils.isNotEmpty(linkTaskId)) {
+//                //结束分支流程
+//                this.newFlowClient.completeApprovalTask(linkTaskId, taskParallel.getParallelProcessInstanceId(), "上报人主动废除");
+//            }
+//        }
+//        //获取主流程的任务ID
+//        String masterTaskId = this.newFlowClient.queryTaskIdByProcessInstanceId(task.getProcessInstanceId());
+//        if (StringUtils.isNotEmpty(masterTaskId)) {
+//            //结束主流程
+//            this.newFlowClient.completeApprovalTask(masterTaskId, task.getProcessInstanceId(), "上报人主动废除");
+//        }
 
         //修改主流程状态为3
         this.update(Wrappers.<Task>lambdaUpdate().set(Task::getStatus, 3).eq(Task::getId, task.getId()));
@@ -1433,26 +1433,26 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             vo.setStartTime(DateUtil.format(nowTime, "yyyy-MM-dd"));
             vo.setEndTime(DateUtil.format(DateUtils.addDays(nowTime, vo.getRestrictDay()), "yyyy-MM-dd"));
 
-            Query query = new Query();
-            query.setCurrent(1);
-            query.setSize(999);
+//            Query query = new Query();
+//            query.setCurrent(1);
+//            query.setSize(999);
             //获取流程
-            List<FlowProcessVO> modeProcessVOS = this.newFlowClient.startFlowList("", query, 1);
-            if (modeProcessVOS == null || modeProcessVOS.size() == 0) {
-                return false;
-            }
+//            List<FlowProcessVO> modeProcessVOS = this.newFlowClient.startFlowList("", query, 1);
+//            if (modeProcessVOS == null || modeProcessVOS.size() == 0) {
+//                return false;
+//            }
             //获取当中的审批流程
-            String taskFlowId = null;
-            for (FlowProcessVO processVO : modeProcessVOS) {
-                if ("approval".equals(processVO.getKey())) {
-                    taskFlowId = processVO.getId();
-                    break;
-                }
-            }
-            //如果没有对应流程，直接返回
-            if (StringUtils.isEmpty(taskFlowId)) {
-                return false;
-            }
+            String taskFlowId = SnowFlakeUtil.getId() + "";
+//            for (FlowProcessVO processVO : modeProcessVOS) {
+//                if ("approval".equals(processVO.getKey())) {
+//                    taskFlowId = processVO.getId();
+//                    break;
+//                }
+//            }
+//            //如果没有对应流程，直接返回
+//            if (StringUtils.isEmpty(taskFlowId)) {
+//                return false;
+//            }
             //获取选择的固定流程
             List<FixedFlowLink> links = new ArrayList<>();
             if (Long.valueOf("0").equals(vo.getFixedFlowId())) {
@@ -1472,30 +1472,32 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
             }
 
             //启动主流程
-            R<BladeFlow> result = this.flowClient.startProcessInstanceById(taskFlowId, FlowUtil.getBusinessKey(businessTable, String.valueOf(vo.getId())),
-                    Kv.create().set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName()).set("taskUser", TaskUtil.getTaskUser("")));
-            if (result.isSuccess()) {
-                log.debug("主流程已启动,流程ID:" + result.getData().getProcessInstanceId());
-                //拼接并行的实例ID
-                vo.setProcessInstanceId(result.getData().getProcessInstanceId());
-            } else {
-                throw new ServiceException("开启主流程失败");
-            }
+//            R<BladeFlow> result = this.flowClient.startProcessInstanceById(taskFlowId, FlowUtil.getBusinessKey(businessTable, String.valueOf(vo.getId())),
+//                    Kv.create().set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName()).set("taskUser", TaskUtil.getTaskUser("")));
+//            if (result.isSuccess()) {
+//                log.debug("主流程已启动,流程ID:" + result.getData().getProcessInstanceId());
+//                //拼接并行的实例ID
+//                vo.setProcessInstanceId(result.getData().getProcessInstanceId());
+//            } else {
+//                throw new ServiceException("开启主流程失败");
+//            }
+            vo.setProcessInstanceId(SnowFlakeUtil.getId() + "");
 
             //根据所选择的固定流程所含有的环节发起审批任务
             List<TaskParallel> taskParallelArray = new ArrayList<>();
             for (FixedFlowLink link : links) {
                 //启动并行流程
-                Kv variables = Kv.create()
-                        //下一步流程审批人
-                        .set("taskUser", TaskUtil.getTaskUser(link.getFixedFlowLinkUser().toString()));
-                R<BladeFlow> linkResult = this.flowClient.startProcessInstanceById(taskFlowId, FlowUtil.getBusinessKey(businessTable, String.valueOf(vo.getId())), variables);
-                if (result.isSuccess()) {
-                    log.debug("并行流程已启动,流程ID:" + linkResult.getData().getProcessInstanceId());
-                    taskParallelArray.add(new TaskParallel(vo.getProcessInstanceId(), linkResult.getData().getProcessInstanceId(), link.getFixedFlowLinkUser().toString(), link.getFixedFlowLinkUserName()));
-                } else {
-                    throw new ServiceException("开启并行流程失败");
-                }
+//                Kv variables = Kv.create()
+//                        //下一步流程审批人
+//                        .set("taskUser", TaskUtil.getTaskUser(link.getFixedFlowLinkUser().toString()));
+//                R<BladeFlow> linkResult = this.flowClient.startProcessInstanceById(taskFlowId, FlowUtil.getBusinessKey(businessTable, String.valueOf(vo.getId())), variables);
+//                if (linkResult.isSuccess()) {
+//                    log.debug("并行流程已启动,流程ID:" + linkResult.getData().getProcessInstanceId());
+//                    taskParallelArray.add(new TaskParallel(vo.getProcessInstanceId(), linkResult.getData().getProcessInstanceId(), link.getFixedFlowLinkUser().toString(), link.getFixedFlowLinkUserName()));
+//                } else {
+//                    throw new ServiceException("开启并行流程失败");
+//                }
+                  taskParallelArray.add(new TaskParallel(vo.getProcessInstanceId(), SnowFlakeUtil.getId() + "", link.getFixedFlowLinkUser().toString(), link.getFixedFlowLinkUserName()));
             }
             //设置流程信息
             vo.setProcessDefinitionId(taskFlowId);