fix(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

@@ -115,9 +115,13 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         }
         if (!ObjectUtils.isEmpty(dto.getNewUseUnitCreditCode())) {
             // 新使用单位
-            //String[] splitMaintenanceUnitCode = dto.getNewUseUnitCreditCode().split("_");
-            dto.setNewUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
-            dto.setNewUseUnitName(company.getCompanyName().split("_")[1]);
+            if ("个人主体".equals(company.getCompanyType())) {
+                dto.setNewUseUnitCreditCode(company.getCompanyCode().split("_")[1]);
+                dto.setNewUseUnitName(company.getCompanyName().split("_")[1]);
+            } else {
+                dto.setNewUseUnitName(company.getCompanyName());
+                dto.setNewUseUnitCreditCode(company.getCompanyCode());
+            }
         }
         if (!ObjectUtils.isEmpty(dto.getOrgBranchCode())) {
             // 属地监管部门
@@ -441,6 +445,11 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         JSONObject jsonObject = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         JSONArray dataList = JSONObject.parseArray(jsonObject.get("dataList").toString());
         ArrayList<JgCertificateChangeRecordEq> jgCertificateChangeRecordEqs = new ArrayList<>();
+        //List<String> collect = jgCertificateChangeRecordEqs.stream().map(JgCertificateChangeRecordEq::getEquId).collect(Collectors.toList());
+        List<String> collect = dataList.stream()
+                .map(obj -> ((JSONObject) obj).getString("record"))
+                .collect(Collectors.toList());
+
         JgCertificateChangeRecord jgCertificateChangeRecord = new JgCertificateChangeRecord();
         jgCertificateChangeRecord.setApplyNo(jgChangeVehicleRegistrationUnit.getApplyNo());
         jgCertificateChangeRecord.setReceiveOrgName(jgChangeVehicleRegistrationUnit.getReceiveOrgName());
@@ -459,7 +468,6 @@ public class JgChangeVehicleRegistrationUnitServiceImpl extends BaseService<JgCh
         jgCertificateChangeRecord.setEquCategory(manage.getEquCategory());
         jgCertificateChangeRecord.setReceiveCompanyCode(jgChangeVehicleRegistrationUnit.getReceiveCompanyCode());
         jgCertificateChangeRecord.setRoutePath(taskV2Model.getRoutePath());
-        List<String> collect = jgCertificateChangeRecordEqs.stream().map(JgCertificateChangeRecordEq::getEquId).collect(Collectors.toList());
         if ("0".equals(jgChangeVehicleRegistrationUnit.getChangeType()) && !ObjectUtils.isEmpty(collect)) {
             // 区外变更
             // 生成使用登记证编号

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

@@ -253,7 +253,6 @@ public class JgVehicleInformationServiceImpl extends BaseService<JgVehicleInform
                 vehicleInfoDto.setUseUnitCreditCode(company.getCompanyCode());
             }
 
-
             // 接收单位信息
             if (!StringUtils.isEmpty(vehicleInfoDto.getReceiveOrgCode())) {
                 String[] splitReceiveOrgCode = vehicleInfoDto.getReceiveOrgCode().split("_");