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

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

@@ -326,6 +326,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 notice.setNextExecutorIds(String.join(",", roleListNext));
                 notice.setStatus(WorkFlowStatusEnum.UNITCHANGE_RECEIVE.getPass());
                 notice.setNextExecuteUserIds(nextUserIds);
+                setNewUnitInfo(reginParams, notice);
                 JgChangeRegistrationUnitMapper.updateById(notice);
                 commonServiceImpl.deleteTasksByRelationId(notice.getSequenceNbr() + "");
                 createTaskModel(notice, taskname, "1", nextUserIds);
@@ -379,6 +380,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         } else {
             JgChangeRegistrationUnit bean = new JgChangeRegistrationUnit();
             BeanUtils.copyProperties(noticeDto, bean);
+            setNewUnitInfo(reginParams, bean);
             JgChangeRegistrationUnitMapper.updateById(bean);
         }
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
@@ -421,6 +423,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         return noticeDto;
     }
 
+    private void setNewUnitInfo(ReginParams reginParams, JgChangeRegistrationUnit notice) {
+        notice.setNewUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyName().split("_")[1] : reginParams.getCompany().getCompanyName());
+        notice.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
+                reginParams.getCompany().getCompanyCode().split("_")[1] :
+                reginParams.getCompany().getCompanyCode());
+    }
+
 
     /**
      * 分页查询
@@ -625,11 +635,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             model.setPromoter(reginParams.getUserModel().getUserId());
             model.setStatus(taskName[0]);
         }
-        model.setNewUseUnitName(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
-                reginParams.getCompany().getCompanyName().split("_")[1] : reginParams.getCompany().getCompanyName());
-        model.setNewUseUnitCreditCode(CompanyTypeEnum.INDIVIDUAL.getName().equals(reginParams.getCompany().getCompanyType()) ?
-                reginParams.getCompany().getCompanyCode().split("_")[1] :
-                reginParams.getCompany().getCompanyCode());
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -649,6 +654,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         model.setEquList(registrationList.get(0).get("equList").toString());
         JgChangeRegistrationUnit registrationUnit = new JgChangeRegistrationUnit();
         BeanUtils.copyProperties(model, registrationUnit);
+        setNewUnitInfo(reginParams, registrationUnit);
         JgChangeRegistrationUnitMapper.insert(registrationUnit);
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
@@ -778,15 +784,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
         }
 
-        String newUseUnitId = model.getNewUseUnitCreditCode();
-        if (!ObjectUtils.isEmpty(newUseUnitId)) {
-            String[] newUseUnitList = newUseUnitId.split("_");
-            if (newUseUnitList.length > 1) {
-                model.setNewUseUnitCreditCode(newUseUnitList[0]);
-                model.setNewUseUnitName(newUseUnitList[1]);
-            }
-        }
-
         String receiveOrgCode = model.getReceiveOrgCode();
         if (!ObjectUtils.isEmpty(receiveOrgCode)) {
             String[] receiveOrgCodeList = receiveOrgCode.split("_");