优化：移装变更登记 流程 状态赋值

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

@@ -239,8 +239,8 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
             oldTransfer.setReceiveOrgName(receiveOrgName);
         }
         //办理状态
-        oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
-        oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
+        oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass());
+        oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_SUBMIT.getPass());
 
         //es种查询设备信息
         SearchRequest request = new SearchRequest();
@@ -311,12 +311,13 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         //发起流程
         if ("1".equals(submitType)) {
             String instanceId = "";
-            if (!ValidationUtil.isEmpty(map.get("instanceId").toString())) {
-                instanceId = map.get("instanceId").toString();
-                this.flowExecute(oldTransfer.getSequenceNbr(), instanceId, "0", "");
+            if (!ValidationUtil.isEmpty(oldTransfer.getSequenceNbr()) && !ValidationUtil.isEmpty(oldTransfer.getInstanceId())) {
+                this.flowExecute(oldTransfer.getSequenceNbr(), oldTransfer.getInstanceId(), "0", "");
             } else {
                 // 如果是新启动的流程开启自动访问
                 String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(tableData.get("equList").toString()).orElse(" "));
+                oldTransfer.setAuditStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
+                oldTransfer.setStatus(WorkFlowStatusEnum.TRANSFER_RECEIVE.getPass());
                 oldTransfer.setEquipListName(equipListName);
                 oldTransfer.setCreateUserId(reginParams.getUserModel().getUserId());
                 oldTransfer.setCreateUserName(reginParams.getUserModel().getRealName());
@@ -631,7 +632,6 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
         }
 
         if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(taskCode)) {
-
             jgChangeRegistrationTransfer.setInstanceId(instanceId);
             jgChangeRegistrationTransfer.setNextTaskId(workflowResult.getNextTaskId());
             jgChangeRegistrationTransfer.setNextExecutorIds(role);