优化：移装变更登记bug

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationTransferController.java

@@ -96,7 +96,7 @@ public class JgChangeRegistrationTransferController extends BaseController {
 	@PostMapping(value = "/flowExecute")
 	@ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
 	public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
-		jgChangeRegistrationTransferService.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")), true);
+		jgChangeRegistrationTransferService.flowExecute(Long.valueOf(String.valueOf(map.get("sequenceNbr"))),String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("opinion")));
 		return ResponseHelper.buildResponse("ok");
 	}
 

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

@@ -311,8 +311,9 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //发起流程
         if ("1".equals(submitType)) {
             String instanceId = "";
-            if (map.containsKey("instanceId")) {
-                instanceId = map.get("instanceId").toString();
+            if (tableData.containsKey("instanceId") && !ValidationUtil.isEmpty(tableData.get("instanceId"))) {
+                instanceId = tableData.get("instanceId").toString();
+                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, "0", "");
             } else {
                 // 如果是新启动的流程开启自动访问
                 String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(tableData.get("equList").toString()).orElse(" "));
@@ -327,13 +328,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
                 //生成代办
                 this.createToDoTask(Arrays.asList(workflowResult), oldTransfer, reginParams.getUserModel().getUserName());
             }
-
-            if (!ObjectUtils.isEmpty(instanceId)) {
-                // 修改数据信息
-//                this.updateExecuteIds(oldTransfer.getSequenceNbr(), "0");
-
-                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, "0", "", false);
-            }
         }
         return true;
     }
@@ -355,9 +349,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
      * @param instanceId
      * @param operate
      * @param comment
-     * @param update
      */
-    public void flowExecute(Long id, String instanceId, String operate, String comment, boolean update) {
+    public void flowExecute(Long id, String instanceId, String operate, String comment) {
         WorkflowResultDto workflowResult = new WorkflowResultDto();
         JgChangeRegistrationTransfer transfer = this.getById(id);
         try {