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

@@ -119,6 +119,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private static final String DEFINITION_KEY = "useRegistration";
     private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废");
+    private final List<String> NOT_FLOWING_STATE_FINISH = new ArrayList<String>(NOT_FLOWING_STATE) {{
+        add("已完成");
+    }};
     private static final String CITY = "CITY";
     private static final String COUNTY = "COUNTY";
     private static final String REGION = "REGION";
@@ -1034,8 +1037,17 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 }
             }
 
+            //管道，并且进行装置合并，且有使用登记证
+            if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategoryCode)
+                    && jgUseRegistration.getOriginProjectContraptionIds() != null
+                    && !jgUseRegistration.getOriginProjectContraptionIds().contains(jgUseRegistration.getProjectContraptionId())
+                    && Objects.nonNull(jgUseRegistration.getUseRegistrationCode())) {
+                useRegistrationCode = jgUseRegistration.getUseRegistrationCode();
+                flag = true;
+            }
+
             List<Map<String, Object>> equipmentLists = (List<Map<String, Object>>) mapData.get("equipmentLists");
-            String inspectConclusionName = getInspectConclusionName(mapData);
+//            String inspectConclusionName = getInspectConclusionName(mapData);
             if (!CollectionUtils.isEmpty(equipmentLists)) {
                 for (int i = 0; i < equipmentLists.size(); i++) {
                     Map<String, Object> equipment = equipmentLists.get(i);
@@ -1049,9 +1061,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
 
                     // 压力管道：[更新的原始引用]更新检验日期-nextInspectDate、检验结论-inspectConclusion、检验机构名称-inspectOrgName
-                    equipment.put("nextInspectDate", mapData.getOrDefault("nextInspectDate", ""));
-                    equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
-                    equipment.put("inspectConclusion", inspectConclusionName);
+//                    equipment.put("nextInspectDate", mapData.getOrDefault("nextInspectDate", ""));
+//                    equipment.put("inspectOrgName", mapData.getOrDefault("inspectOrgName", ""));
+//                    equipment.put("inspectConclusion", inspectConclusionName);
                     // 更新设备信息 && 生成使用登记证编号 && 同步es
                     processMapData(sequenceNbr, mapData, jgUseRegistration, jgRegistrationHistory, registerInfo, taskV2Model, jsonObject, flag, useRegistrationCode);
                     // 查询设备制造信息
@@ -1072,7 +1084,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, String.valueOf(mapData.get("equipId")));
             IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
             // 单位办理的压力管道，在完成审批时，将检验信息写入到装置检验信息表
-            savePieLineProjectInspectData(jgUseRegistration, registerInfo, mapData);
+//            savePieLineProjectInspectData(jgUseRegistration, registerInfo, mapData);
             // 生成证书管理表
             generateRegistrationManage(jgUseRegistration, registerInfo, flag, useRegistrationManageSeq);
 
@@ -1101,12 +1113,39 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jgProjectContraption.setCityName(getRegionName(CITY, CITY.toLowerCase(), mapData));
             jgProjectContraption.setCountyName(getRegionName(REGION, COUNTY.toLowerCase(), mapData));
             jgProjectContraption.setStreetName(getRegionName(STREET, "factoryUseSiteStreet", mapData));
+            jgProjectContraption.setIsFirstMerge(false);
             if (!StringUtils.isEmpty(mapData.get("orgBranchCode"))) {
                 jgProjectContraption.setOrgName(String.valueOf(mapData.getString("orgBranchCode")).split("_")[1]);
                 jgProjectContraption.setOrgCode(String.valueOf(mapData.getString("orgBranchCode")).split("_")[0]);
             }
             jgProjectContraptionService.updateById(jgProjectContraption);
         }
+        //装置进行合并
+        if (!jgUseRegistration.getOriginProjectContraptionIds().contains(jgUseRegistration.getProjectContraptionId())){
+            //1.修改所有原始工程id集合下的use_info表中的工程装置Id为总工程装置ID
+            List<IdxBizJgUseInfo> useInfoList  = idxBizJgUseInfoService.lambdaQuery()
+                    .in(IdxBizJgUseInfo::getProjectContraptionId, jgUseRegistration.getOriginProjectContraptionIds())
+                    .list();
+            for (IdxBizJgUseInfo useInfo : useInfoList) {
+                Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(useInfo.getRecord());
+                equInfosWithEs.ifPresent(equInfoEs -> {
+                    if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equInfoEs.getEQU_CATEGORY_CODE())) {
+                        equInfoEs.setProjectContraptionId(useInfo.getProjectContraptionId());
+                        esEquipmentCategory.save(equInfoEs);
+                    }
+                });
+                useInfo.setProjectContraptionId(jgUseRegistration.getProjectContraptionId());
+                useInfoMapper.updateById(useInfo);
+            }
+            //2.修改原始工程装置表中的父级工程装置为总工程装置ID
+            List<IdxBizJgProjectContraption> projectContraptionList  = jgProjectContraptionService.lambdaQuery()
+                    .in(BaseEntity::getSequenceNbr, jgUseRegistration.getOriginProjectContraptionIds())
+                    .list();
+            for (IdxBizJgProjectContraption contraption : projectContraptionList) {
+                contraption.setProjectContraptionParentId(jgUseRegistration.getProjectContraptionId());
+                jgProjectContraptionService.updateById(contraption);
+            }
+        }
     }
 
     /**
@@ -3901,7 +3940,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         // 查询流程中的装置
         List<JgUseRegistration> flowIngPros = this.list(
                 new LambdaQueryWrapper<JgUseRegistration>()
-                        .notIn(JgUseRegistration::getStatus, NOT_FLOWING_STATE)
+                        .notIn(JgUseRegistration::getStatus, NOT_FLOWING_STATE_FINISH)
                         .select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId)
         );
         Set<String> proIds = flowIngPros.stream()