fix(检验业务开通按钮权限)：保存接口按钮错误

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcOpeningApplicationServiceImpl.java

@@ -116,17 +116,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                     // 未开启过工作流则进行开启 startProcess
                     instanceId = startFlow("1");
                 }
-                // JSONObject dataObject = getTask(instanceId);
-                // JSONArray executorArray = dataObject.getJSONObject("nodeInfo").getJSONArray("executor");
-                // if (!ValidationUtil.isEmpty(executorArray)) {
-                //     String roleGroups = executorArray.stream().map(json -> Optional.ofNullable(((LinkedHashMap) json).get("groupId")).orElse("").toString()).collect(Collectors.joining(","));
-                //     model.setWorkflowRole(roleGroups);
-                // }
                 model.setStatus(FlowStatusEnum.SUBMITTED.getCode() + "");
                 model.setStatusName(FlowStatusEnum.SUBMITTED.getName());
                 model.setApplyTime(new Date());
-                // model.setWorkflowActiveKey(dataObject.getString("taskDefinitionKey"));
                 model.setWorkflowProstanceId(instanceId);
+                // 默认自动执行第一步
+                execueFlowNoBusiness(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
+                // 查询下节点任务
+                Map<String, Object> nextNodeInfo = workflowHelper.getNextWorkflowNode(instanceId);
+                String role = (String) nextNodeInfo.get("role");
+                model.setNextExecuteIds(role);
+                if (!org.springframework.util.ObjectUtils.isEmpty(model.getWorkflowRole())) {
+                    model.setWorkflowRole(model.getWorkflowRole() + "," + role);
+                } else {
+                    model.setWorkflowRole(role);
+                }
             } else {
                 model.setStatus(FlowStatusEnum.TO_BE_SUBMITTED.getCode() + "");
                 model.setStatusName(FlowStatusEnum.TO_BE_SUBMITTED.getName());
@@ -138,10 +142,6 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
                 List<String> codes = createCodeService.createApplicationFormCode(ApplicationFormTypeEnum.JY.getCode(), 1);
                 model.setApplicationSeq(codes.get(0));
                 model = this.createWithModel(model);
-                if (enableStartFlow) {
-                    // 默认自动执行第一步
-                    execueFlow(MapBuilder.<String, Object>create().put("op", "0").put("instanceId", instanceId).put("comments", "").build());
-                }
                 return model;
             } else {
                 return this.updateWithModel(model);
@@ -338,6 +338,35 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     /**
      * 接收/驳回通知检验单
      */
+    public void execueFlowNoBusiness(Map<String, Object> params) {
+        String op = params.get("op").toString();
+        String instanceId = params.get("instanceId").toString();
+        String comments = params.get("comments").toString();
+        try {
+            AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
+            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            String taskId = dataObject.getString("id");
+            //组装信息
+            TaskResultDTO dto = new TaskResultDTO();
+//            dto.setResult(op);
+            dto.setResultCode("approvalStatus");
+            dto.setTaskId(taskId);
+            HashMap<String, Object> varibalble = new HashMap<>();
+            varibalble.put("approvalStatus", op);
+            dto.setVariable(varibalble);
+            dto.setComment(comments);
+            //执行流程
+            Workflow.taskClient.completeByTask(taskId, dto);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("execueFlow error:{}", e);
+        }
+    }
+
+
+    /**
+     * 接收/驳回通知检验单
+     */
     public void execueFlow(Map<String, Object> params) {
         String op = params.get("op").toString();
         String instanceId = params.get("instanceId").toString();