优化：移装变更登记添加下一步可执行人

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/JgChangeRegistrationTransferDto.java

@@ -122,4 +122,6 @@ public class JgChangeRegistrationTransferDto extends BaseDto {
     private  String dataType;
     private String unitCode;
 
+    @ApiModelProperty (value = "下一节点可执行人")
+    private String nextExecuteUserIds;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgChangeRegistrationTransfer.java

@@ -232,4 +232,11 @@ public class JgChangeRegistrationTransfer extends BaseEntity {
      */
     @TableField(value = "equip_list_name")
     private String equipListName;
+
+    /**
+     * 下一节点可执行人
+     */
+    @TableField(value = "next_execute_user_ids")
+    private String nextExecuteUserIds;
+
 }

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

@@ -400,6 +400,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
         jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
         jgTransfer.setNextExecutorIds(role);
+        // 更新下一步可执行人
+        jgTransfer.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+
         this.update(jgTransfer, lambda);
         //待办 撤回
         JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(jgTransfer));
@@ -635,6 +638,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             jgChangeRegistrationTransfer.setInstanceId(instanceId);
             jgChangeRegistrationTransfer.setNextTaskId(workflowResult.getNextTaskId());
             jgChangeRegistrationTransfer.setNextExecutorIds(role);
+            //更新下一步可执行人
+            jgChangeRegistrationTransfer.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
 
             if (!ObjectUtils.isEmpty(jgChangeRegistrationTransfer.getInstanceStatus())) {
                 jgChangeRegistrationTransfer.setInstanceStatus(jgChangeRegistrationTransfer.getInstanceStatus() + "," + role);
@@ -684,6 +689,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             jgChangeRegistrationTransfer.setAuditPassDate(new Date());
             jgChangeRegistrationTransfer.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationTransfer.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
+            //更新下一步可执行人
+            jgChangeRegistrationTransfer.setNextExecuteUserIds("");
             //流程执行完成后，更新设备使用信息
             this.updateByFlowEnd(jgChangeRegistrationTransfer.getSequenceNbr().toString(), jgChangeRegistrationTransfer.getSupervisoryCode());
             HashMap<String, Object> map = new HashMap<>();
@@ -1049,10 +1056,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 toDoTask.setFlowStatus(commonService.getDictionaryCodeByName(transfer.getStatus()));
                 toDoTask.setFlowStatusLabel(transfer.getStatus());
                 toDoTask.setFlowCode(transfer.getNextTaskId());
-                String url = this.getUrl(BusinessTypeEnum.JG_CHANGE_REGISTRATION.getCode(), "look");
-                String format = String.format(url, transfer.getSequenceNbr(), transfer.getNextExecutorIds(), transfer.getNextExecutorIds(),
-                        transfer.getAuditStatus(), transfer.getInstanceId());
-                toDoTask.setRoutePath(format);
                 toDoTask.setModel(transfer);
                 toDoTask.setStartUserId(transfer.getCreateUserId());
                 toDoTask.setStartUser(transfer.getCreateUserName());
@@ -1065,25 +1068,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
     }
 
-    //获取流程跳转页面的url
-    private String getUrl(String type, String pageType) {
-        String json = null;
-        try {
-            json = IOUtils.toString(bizTypeInfo.getInputStream(), java.lang.String.valueOf(StandardCharsets.UTF_8));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        List<Map> list = parseArray(json, Map.class);
-        String url = null;
-        for (Map map : list) {
-            if (map.get("type").equals(type) && pageType.equals(map.get("pageType"))) {
-                url = map.get("url").toString();
-                break;
-            }
-        }
-        return url;
-    }
-
     private FlowStatusEnum getTaskStatus(String operate) {
         if ("0".equals(operate)) {
             return FlowStatusEnum.TO_BE_FINISHED;

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json

@@ -105,13 +105,13 @@
     "type": "110",
     "pageType": "look",
     "name": "移装变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=look&auditStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737388393685348353&roleIds={roleIds}&userId={userId}&formType=look"
   },
   {
     "type": "110",
     "pageType": "edit",
     "name": "移装变更登记",
-    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&sequenceNbr=%s&roleIds=%s&userId={userId}&nextExecuteIds=%s&pageType=edit&auditStatus=%s&instanceId=%s"
+    "url": "/mixuap?appId=1742358052905971713&id=1737388347548004354&roleIds={roleIds}&userId={userId}&pageType=edit"
   },
   {
     "type": "111",