fix(检验业务开通)：更新按钮权限 & 数据权限

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/FlowStatusEnum.java

@@ -14,9 +14,27 @@ public enum  FlowStatusEnum {
      */
     SUBMITTED(6611, "已提交"),
     /**
+     * 待受理
+     */
+    TO_BE_PROCESSED(6612, "待受理"),
+    /**
+     * 已办理
+     */
+    HAVE_PROCESSED(6613, "已办理"),
+
+    /**
+     * 已驳回
+     */
+    REJECTED(6614, "已驳回"),
+
+    /**
+     * 已撤回
+     */
+    ROLLBACK(6615, "已撤回"),
+    /**
      * 已完成
      */
-    TO_BE_FINISHED(6612, "已完成");
+    TO_BE_FINISHED(6616, "已完成");
 
     private final int code;
 

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/JyjcInspectionApplicationServiceImpl.java

@@ -283,7 +283,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         String type = (String) params.get("type");
         Long sequenceNbr = Long.parseLong(params.get("sequenceNbr") + "");
         JyjcInspectionApplicationModel inspectionApplicationModel = this.queryBySeq(sequenceNbr);
-        updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), MapBuilder.<String, Object>create().put("status", FlowStatusEnum.SUBMITTED.getCode() + "").build());
+        params.put("status", FlowStatusEnum.SUBMITTED.getCode() + "");
+        updateModelByInstanceId(inspectionApplicationModel.getProcessInstanceId(), params);
         List<JyjcInspectionApplicationEquipModel> applicationEquipModels = applicationEquipService.listApplicationEquipByApplicationSeq(sequenceNbr);
         if (inspectionApplicationModel == null || ValidationUtil.isEmpty(applicationEquipModels)) {
             log.warn("JyjcInspectionApplicationModel Not Found！");
@@ -410,7 +411,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             log.warn("流程=>{}查询不到或已结束", instanceId);
             return;
         }
-        entity.setWorkflowRole(workflowHelper.getWorkflowRoleGroups(taskJson));
+        Map<String, Object> nextWorkflow = workflowHelper.getNextWorkflowNode(instanceId);
+        entity.setWorkflowRole((String) nextWorkflow.get("role"));
         entity.setWorkflowNode(taskJson.getString("taskDefinitionKey"));
         // entity.setWorkflowActiveKey();
         entity.setStatus(status);

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/WorkflowHelper.java

@@ -49,9 +49,9 @@ public class WorkflowHelper {
     public JSONObject getTask(String instanceId) {
         AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
         JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-        String taskId = dataObject.getString("id");// 工作流ID
-        FeignClientResult<JSONObject> nodeInfo = workflowFeignClient.getNodeInfotoken(RequestContext.getAppKey(), RequestContext.getProduct(), RequestContext.getToken(), taskId);
-        dataObject.put("nodeInfo", nodeInfo.getResult());
+        // String taskId = dataObject.getString("id");// 工作流ID
+        // FeignClientResult<JSONObject> nodeInfo = workflowFeignClient.getNodeInfotoken(RequestContext.getAppKey(), RequestContext.getProduct(), RequestContext.getToken(), taskId);
+        // dataObject.put("nodeInfo", nodeInfo.getResult());
         return dataObject;
     }