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

@@ -1092,7 +1092,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             String useRegistrationCode = null;
             Long useRegistrationManageSeq = null;
-            Boolean flag = Boolean.FALSE;
+            AtomicReference<Boolean> flag = new AtomicReference<>(Boolean.FALSE);
             boolean isMerge = Boolean.FALSE;
             String equCategoryCode = String.valueOf(mapData.get("EQU_CATEGORY_CODE"));
             String equDefineCode = String.valueOf(mapData.get("EQU_DEFINE_CODE"));
@@ -1107,10 +1107,25 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             }
             //如果是气瓶或工业管道判断之前是否已经做过使用登记
             if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategoryCode)) {
-                //如果是增补功能
-                if ("1".equals(jgUseRegistration.getIsAddEquip())) {
+                flag.set("1".equals(jgUseRegistration.getIsAddEquip()));
+                if (flag.get()) {
                     useRegistrationCode = jgUseRegistration.getUseRegistrationCode();
-                    flag = Boolean.TRUE;
+                } else {
+                    JgUseRegistrationManageDto dto = new JgUseRegistrationManageDto();
+                    dto.setCertificateStatus(CertificateStatusEnum.YIDENGJI.getName());
+                    dto.setUseUnitCreditCode(jgUseRegistration.getUseUnitCreditCode());
+                    dto.setRegType("0");
+                    useRegistrationCode = Optional.ofNullable(jgUseRegistrationManageMapper.queryByUseUnitCreditCode(dto))
+                            .filter(list -> !list.isEmpty())
+                            .flatMap(list -> list.stream()
+                                    .map(JgUseRegistrationManageDto::getUseRegistrationCode)
+                                    .filter(code -> code.startsWith("瓶30"))
+                                    .findFirst())
+                            .map(code -> {
+                                flag.set(Boolean.TRUE);
+                                return code;
+                            })
+                            .orElse(null);
                 }
             }
 
@@ -1120,7 +1135,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     && !jgUseRegistration.getOriginProjectContraptionIds().contains(jgUseRegistration.getProjectContraptionId())
                     && Objects.nonNull(jgUseRegistration.getUseRegistrationCode())) {
                 useRegistrationCode = jgUseRegistration.getUseRegistrationCode();
-                flag = true;
+                flag.set(true);
                 isMerge = true;
             }
 
@@ -1176,7 +1191,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 //                    equipment.put("inspectConclusion", inspectConclusionName);
                     // 更新设备信息 && 生成使用登记证编号 && 同步es
                     this.processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, otherInfo, taskV2Model,
-                            jsonObject, flag, useRegistrationCode, equipment, isMerge);
+                            jsonObject, flag.get(), useRegistrationCode, equipment, isMerge);
                     // 查询设备制造信息
                     LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
                     factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, equId);
@@ -1204,10 +1219,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             // 单位办理的压力管道，在完成审批时，将检验信息写入到装置检验信息表
 //            savePieLineProjectInspectData(jgUseRegistration, registerInfo, mapData);
             // 生成证书管理表
-            generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationManageSeq);
+            generateRegistrationManage(jgUseRegistration, registerInfo, flag.get(), useRegistrationManageSeq);
 
             // 生成一条tzs_jg_certificate_change_record记录
-            generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag);
+            generateCertificateChangeRecord(jgUseRegistration, registerInfo, changeRecordId, taskV2Model, flag.get());
             // 更新历史表：下次检验日期、检验机构名称、检验结论在压力管道、气瓶时更新子表单的数据
             jgRegistrationHistory.setChangeData(JSON.toJSONString(mapData));
             jgRegistrationHistoryService.updateById(jgRegistrationHistory);