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/edit/process/biz/newProject/NewProjectEditUpdateService.java

@@ -31,7 +31,10 @@ public class NewProjectEditUpdateService {
     public void updateBizInfo(String projectContraptionId) {
         IdxBizJgProjectContraption projectContraption = commonEquipDataProcessService.getIdxBizJgProjectContraptionServiceImpl().getOne(new LambdaQueryWrapper<IdxBizJgProjectContraption>().eq(BaseEntity::getSequenceNbr, projectContraptionId).select(BaseEntity::getSequenceNbr, IdxBizJgProjectContraption::getUseRegistrationCode));
         // 按照装置id查询装置下管道，更新为已纳管状态写入使用登记证编号
-        List<IdxBizJgUseInfo> useInfos = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(IdxBizJgUseInfo::getRecord, TzsBaseEntity::getSequenceNbr));
+        List<IdxBizJgUseInfo> useInfos = useInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>()
+                .eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId)
+                //.eq(IdxBizJgUseInfo::getIsIntoManagement, false)修改已纳管管道编辑使用登记证号，不更新bug
+                .select(IdxBizJgUseInfo::getRecord, TzsBaseEntity::getSequenceNbr));
         useInfos.parallelStream().forEach(e -> {
             commonEquipDataProcessService.setNewPipelineUseState(e, projectContraption.getUseRegistrationCode());
             commonEquipDataProcessService.updateUseOrgCode2NewPipeline(e, projectContraption.getUseRegistrationCode());

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/CommonEquipDataProcessService.java

@@ -1137,7 +1137,10 @@ public class CommonEquipDataProcessService {
     }
 
     public void updatePipeline2InUse(String projectContraptionId, String useRegistrationCode) {
-        List<IdxBizJgUseInfo> useInfos = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>().eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId).eq(IdxBizJgUseInfo::getIsIntoManagement, false).select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
+        List<IdxBizJgUseInfo> useInfos = idxBizJgUseInfoService.list(new LambdaQueryWrapper<IdxBizJgUseInfo>()
+                .eq(IdxBizJgUseInfo::getProjectContraptionId, projectContraptionId)
+                .eq(IdxBizJgUseInfo::getIsIntoManagement, false)
+                .select(TzsBaseEntity::getSequenceNbr, IdxBizJgUseInfo::getRecord));
         useInfos.parallelStream().forEach(e -> {
             this.setNewPipelineUseState(e, useRegistrationCode);
             this.updateUseOrgCode2NewPipeline(e, useRegistrationCode);

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

@@ -206,6 +206,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     private static final Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
     public static final String CAR_NUMBER = "CAR_NUMBER";
     public static final String USE_UNIT_NAME = "USE_UNIT_NAME";
+    private static final String PRODUCT_NAME = "PRODUCT_NAME";
     // 需要转化成jsonObject的附件字段
     public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment"};
     private final List<String> resultError = new ArrayList<>();
@@ -2746,6 +2747,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.matchPhraseQuery("USE_PLACE", "*" + param + "*"));
             boolMust.must(pBuilder);
         }
+        // 设备名称
+        if (!ObjectUtils.isEmpty(map.getString(PRODUCT_NAME))) {
+            BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape(map.getString(PRODUCT_NAME));
+            elcBuilder.must(QueryBuilders.matchPhraseQuery(PRODUCT_NAME, test));
+            boolMust.must(elcBuilder);
+        }
         // 设备状态
         if (!ObjectUtils.isEmpty(map.getString("EQU_STATE"))) {
             BoolQueryBuilder esBuilder = QueryBuilders.boolQuery();