fix(jg):修改单位变更bug和管道编辑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/IdxBizJgProjectContraptionServiceImplService.java

@@ -521,14 +521,13 @@ public class IdxBizJgProjectContraptionServiceImplService extends BaseEntityServ
         return getCheckResultMap(projectContraptionIdList, resultMap, inUseTimeMap);
     }
 
-    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList, Map<String, Boolean> resultMap, List<Map<String, Integer>> inUseTimeMap) {
+    private Map<String, Boolean> getCheckResultMap(List<Long> projectContraptionIdList,Map<String, Boolean> resultMap,List<Map<String, Integer>> inUseTimeMap) {
         for (Long projectContraptionId : projectContraptionIdList) {
             Optional<Integer> inUseCountOpt = inUseTimeMap.stream()
-                    .filter(map -> projectContraptionId.toString().equals(map.get("project_contraption_id")))
+                    .filter(map -> String.valueOf(projectContraptionId)
+                            .equals(String.valueOf(map.get("project_contraption_id"))))
                     .map(map -> map.get("inUseNumber"))
-                    .filter(Objects::nonNull)
                     .findFirst();
-
             Integer inUseCount = inUseCountOpt.orElse(0);
             resultMap.put(String.valueOf(projectContraptionId), inUseCount <= 0);
         }

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

@@ -1229,10 +1229,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             esEquipmentCategoryDto.setSEQUENCE_NBR(recordList.toString());
             list.add(esEquipmentCategoryDto);
         }
-        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道
-        if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
+        // 删除校验，被引用时不可删除。管道不做是否引用校验，直接删除已有管道(20251121注释，管道引用不能删除)
+        //if(!PipelineEnum.PRESSURE_PIPELINE.getCode().equals(map.get("equList"))) {
+            //this.checkForDelete(records);
+        //}
         this.checkForDelete(records);
-        }
         if (CollUtil.isNotEmpty(records)) {
             // 删除涉及的19张表的数据
             superviseInfoMapper.deleteDataAll(records);

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

@@ -2004,7 +2004,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                 newList.add(newManage);
                             } else {
                                 registrationManage.setCertificateStatus("已登记");
-                                registrationManage.setEquUseAddress(registration.getEquAddress());
                                 if (EQU_CODE_CC.equals(registrationManage.getEquListCode())) {
                                     String targetCode = registrationManage.getUseRegistrationCode();
                                     dto.getRegistrationList().stream()
@@ -2013,6 +2012,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                             .filter(carNumber -> carNumber != null && !"null".equalsIgnoreCase(carNumber.trim()))
                                             .findFirst()
                                             .ifPresent(registrationManage::setCarNumber);
+                                    registrationManage.setEquUseAddress(registration.getEquAddress());
                                 }
                                 registrationManage.setChangeReason(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
                                 if (!ObjectUtils.isEmpty(registration.getNewUseUnitCreditCode())) {

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/IdxBizJgProjectContraptionMapper.xml

@@ -105,7 +105,7 @@
         LEFT JOIN tzs_jg_use_registration ur
         ON ur.project_contraption_id = pl.project_contraption_id
         AND ur.is_delete = 0
-        AND ur.project_contraption_id != null
+        AND ur.project_contraption_id IS NOT NULL
         AND ur.status NOT IN ('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
         LEFT JOIN tzs_jg_installation_notice ins
         ON ins.project_contraption_id = pl.project_contraption_id
@@ -346,7 +346,7 @@
         WITH target_use AS MATERIALIZED (
         SELECT "RECORD", project_contraption_id
         FROM idx_biz_jg_use_info
-        WHERE project_contraption_id != null and
+        WHERE project_contraption_id is not null and
         project_contraption_id IN
         <foreach collection="projectContraptionIdList" item="id" index="index" open="(" close=")" separator=",">
             #{id}