feat(jg): 车用气瓶单位变更使用登记证好生成逻辑修改

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

@@ -592,8 +592,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
         if ("0".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             // 区外变更
-            // 生成使用登记证编号
-            String receiveCompanyCode = jgChangeVehicleRegistrationUnit.getReceiveCompanyCode();
+            // 生成使用登记证编号,根据行政审批局单位code获取行政区划code
+            String receiveCompanyCode = codeUtil.getCityRegionCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
             CompanyModel receiveCompanyResult = Privilege.companyClient.queryByCompanyCode(receiveCompanyCode).getResult();
             //查询到局级
             // 如果不是局级公司，则查询其上级公司信息
@@ -601,10 +601,8 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
                 CompanyModel receiveParentResult = Privilege.companyClient.seleteOne(receiveCompanyResult.getParentId()).getResult();
                 receiveCompanyCode = receiveParentResult.getCompanyCode();
             }
-            // 根据行政审批局单位code获取行政区划code
-            String regionCode = codeUtil.getCityRegionCode(receiveCompanyCode);
             // 生成新的使用登记证编号
-            String code = this.generateVehicleUseRegistrationCode(regionCode, manage.getEquDefineCode());
+            String code = this.generateVehicleUseRegistrationCode(receiveCompanyCode, manage.getEquDefineCode());
             manage.setUseRegistrationCode(code);
             manage.setRegistrationType("0");
             // 更新设备使用登记证信息