Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -178,9 +178,9 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             } else {
                 throw new BadRequest("申请单编号生成失败,请稍后重试!");
             }
-            jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
-            jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
             jgChangeRegistrationReform.setRegDate(new Date());
+            jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+            jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
             this.save(jgChangeRegistrationReform);
             jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
             jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
@@ -191,7 +191,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             String instanceId = "";
-            if (!ValidationUtil.isEmpty(map.get("instanceId").toString())) {
+            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr())&&!ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
                 instanceId = map.get("instanceId").toString();
                 // 如果是旧流程则执行一步
                 flowExecute(jgChangeRegistrationReform.getSequenceNbr(), instanceId, "0", "");
@@ -199,6 +199,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             } else {
                 // 如果是新启动的流程开启自动访问
                 String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
+                jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
+                jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
                 jgChangeRegistrationReform.setEquipListName(equipListName);
                 jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
                 jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());