fix(jg):管道使用登记功能Bug修改

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

@@ -1145,8 +1145,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 更新工程装置信息
             if (Objects.nonNull(jgProjectContraption)) {
                 jgProjectContraption.setUseRegistrationCode(jgUseRegistration.getUseRegistrationCode());
+                jgProjectContraptionService.updateById(jgProjectContraption);
             }
-            jgProjectContraptionService.updateById(jgProjectContraption);
             // 取第一条设备的注册消息--用来获取这一批设备的设备种类/类别/品种
             LambdaQueryWrapper<IdxBizJgRegisterInfo> lambdaReg = new QueryWrapper<IdxBizJgRegisterInfo>().lambda();
             lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
@@ -1547,6 +1547,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 生成使用登记证编号
         if (!ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode())) {
             if ("unit".equals(jgUseRegistration.getManageType())) {
+                boolean isFirstMerge = Optional.ofNullable(mapData.get("isFirstMerge"))
+                        .map(Boolean.class::cast)
+                        .orElse(false);
                 if ((Boolean) mapData.get("isFirstEquip")) {
                     String code = flag ? useRegistrationCode : commonServiceImpl.generateRegistrationCode(String.valueOf(mapData.get("equipId")), jgUseRegistration.getSupervisoryCode(),
                             jgUseRegistration.getReceiveCompanyCode(), true);
@@ -1558,7 +1561,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, code);
                     // 新增页面选择无设备代码后，在审批通过后自动生成设备代码
                     this.justGenerateEquCode(lambda, registerInfo, jgUseRegistration.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
-                    lambda.set(isMerge ||(Boolean) mapData.get("isFirstMerge"), IdxBizJgRegisterInfo::getEquCode, registerInfo.getEquCode());
+                    lambda.set(isMerge || isFirstMerge, IdxBizJgRegisterInfo::getEquCode, registerInfo.getEquCode());
                     idxBizJgRegisterInfoService.update(lambda);
                 } else {
                     registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
@@ -1567,7 +1570,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     lambda.set(true, IdxBizJgRegisterInfo::getUseOrgCode, jgUseRegistration.getUseRegistrationCode());
                     // 新增页面选择无设备代码后，在审批通过后自动生成设备代码
                     this.justGenerateEquCode(lambda, registerInfo, jgUseRegistration.getReceiveCompanyCode(), mapData, jgRegistrationHistory);
-                    lambda.set(isMerge ||(Boolean) mapData.get("isFirstMerge"), IdxBizJgRegisterInfo::getEquCode, registerInfo.getEquCode());
+                    lambda.set(isMerge || isFirstMerge, IdxBizJgRegisterInfo::getEquCode, registerInfo.getEquCode());
                     idxBizJgRegisterInfoService.update(lambda);
                 }
             } else {
@@ -3005,17 +3008,24 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                                 processElseDataByStatus(oldStatus, jgUseRegistration);
                                 // 统一处理设备的纳管状态【注册事务提交后的操作】
                                 registerAfterCommitTask(records);
+                            }else{
+                                List<IdxBizJgUseInfo> useInfoRecords = idxBizJgUseInfoService.lambdaQuery()
+                                        .select(IdxBizJgUseInfo::getRecord)
+                                        .in(IdxBizJgUseInfo::getProjectContraptionId, Arrays.asList(jgUseRegistration.getOriginProjectContraptionIds().split(",")))
+                                        .list();
+                                records = useInfoRecords.stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
+                                // 统一处理设备的纳管状态【注册事务提交后的操作】
+                                registerAfterCommitTask(records);
                             }
                         }
                     }
                     //1.子工程装置作废，正常逻辑
                     else {
                         jgUseRegistration.setStatus(FlowStatusEnum.TO_BE_DISCARD.getName());
-                        // 处理非批量导入数据，更新关联业务状态
-                        processElseDataByStatus(oldStatus, jgUseRegistration);
                         // 统一处理设备的纳管状态【注册事务提交后的操作】
                         registerAfterCommitTask(records);
                     }
+                    processElseDataByStatus(oldStatus, jgUseRegistration);
                 }
                 //气瓶
                 else {