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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -267,4 +267,11 @@ public class JgUseRegistration extends BaseEntity {
      */
     @TableField("project_contraption_id")
     private String projectContraptionId;
+
+    /**
+     * 原始需合并工程装置id集合
+     */
+    @TableField("origin_project_contraption_ids")
+    private String originProjectContraptionIds;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistrationEq.java

@@ -40,4 +40,9 @@ public class JgUseRegistrationEq extends BaseEntity {
     @TableField("is_invalid")
     private Boolean isInvalid =false;
 
+    /**
+     * 原始需合并工程装置id
+     */
+    @TableField("origin_project_contraption_id")
+    private String originProjectContraptionId;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

@@ -346,7 +346,13 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.updateCylinderCategoryByEquCodeBatch(cylinderCategory, equCodeList));
     }
 
-
+    /**
+     * 查询无使用登记证，不在流程中的，已纳管的，装置父ID为空的数据
+     * @param useUnitCreditCode 使用登记证编号
+     * @param current 当前页
+     * @param size 每页数
+     * @return page
+     */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/jgProjectContraptionPage")
     @ApiOperation(value = "查询指定使用单位下的可用装置，已纳管且使用登记证编号为空或者null", notes = "不包括流程中的")
@@ -360,11 +366,30 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(re);
     }
 
+    /**
+     * 查询有使用登记证，新增的，没有流程引用的数据
+     * @param useUnitCreditCode 使用登记证编号
+     * @param current 当前页
+     * @param size 每页数
+     * @return page
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/jgProjectContraptionPageMaster")
+    @ApiOperation(value = "查询指定使用单位下的可用总装置，已纳管且使用登记证编号不为空或者首次合并为true", notes = "不包括流程中的")
+    public ResponseModel<IPage<IdxBizJgProjectContraption>> jgProjectContraptionPageMaster(@RequestParam String useUnitCreditCode,
+                                                                                        @RequestParam(value = "current") int current,
+                                                                                        @RequestParam(value = "size") int size) {
+        Page<IdxBizJgProjectContraption> page = new Page<>();
+        page.setCurrent(current);
+        page.setSize(size);
+        IPage<IdxBizJgProjectContraption> re = jgUseRegistrationServiceImpl.jgProjectContraptionPageMaster(useUnitCreditCode, page);
+        return ResponseHelper.buildResponse(re);
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询工程装置下的所有做过安装告知但是为做使用登记的管道", notes = "查询工程装置下的所有做过安装告知但是为做使用登记的管道")
     @GetMapping(value = "/getDeviceListByProjectContraptionSeq")
     public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam("record") String projectContraptionSeq) {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDeviceListByProjectContraption(projectContraptionSeq));
     }
-
 }

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

@@ -131,6 +131,7 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
                 .like(!ValidationUtil.isEmpty(projectContraptionNo), IdxBizJgProjectContraption::getProjectContraptionNo, projectContraptionNo)
                 .isNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.TRUE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
                 .isNotNull(!ValidationUtil.isEmpty(regCodeIsNull) && Boolean.FALSE.equals(Boolean.valueOf(regCodeIsNull)), IdxBizJgProjectContraption::getUseRegistrationCode)
+                .isNull(IdxBizJgProjectContraption::getProjectContraptionParentId)
                 .orderByDesc(IdxBizJgProjectContraption::getRecDate)
                 .page(page);
         pageList.getRecords().forEach(record -> {

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

@@ -439,6 +439,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         throw new IllegalArgumentException("参数类型错误，期望 LinkedHashMap 类型: " + obj);
     }
 
+    // 通用方法初始化 List
+    private <T> List<T> initializeList() {
+        return new ArrayList<>(15);
+    }
+
     private Long batchSubmitOrUpdatePipeline(LinkedHashMap equipmentInfoForm, String submitType) {
         Date date = new Date();
         String operateType = ValidationUtil.isEmpty(equipmentInfoForm.get(SEQUENCE_NBR)) ? OPERATESAVE : OPERATEEDIT;
@@ -505,18 +510,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         projectContraption.setUscUnitName(companyInfoMap.get("companyName").toString());
         projectContraption.setUscUnitCreditCode(companyInfoMap.get("creditCode").toString());
+        projectContraption.setIsFirstMerge(false);
         idxBizJgProjectContraptionService.saveOrUpdateData(projectContraption);
 
-        List<IdxBizJgUseInfo> useInfoList = new ArrayList<>(10);
-        List<IdxBizJgDesignInfo> designInfoList = new ArrayList<>(10);
-        List<IdxBizJgFactoryInfo> factoryInfoList = new ArrayList<>(10);
-        List<IdxBizJgConstructionInfo> constructionInfoList = new ArrayList<>(10);
-        List<IdxBizJgRegisterInfo> registerInfoList = new ArrayList<>(10);
-        List<IdxBizJgSupervisionInfo> supervisionInfoList = new ArrayList<>(10);
-        List<IdxBizJgOtherInfo> otherInfoList = new ArrayList<>(10);
-        List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = new ArrayList<>(10);
-        List<IdxBizJgTechParamsPipeline> paramsPipelineList = new ArrayList<>(10);
-        List<ESEquipmentCategoryDto> esEquipmentCategoryList = new ArrayList<>(10);
+        List<IdxBizJgUseInfo> useInfoList = initializeList();
+        List<IdxBizJgDesignInfo> designInfoList = initializeList();
+        List<IdxBizJgFactoryInfo> factoryInfoList = initializeList();
+        List<IdxBizJgConstructionInfo> constructionInfoList = initializeList();
+        List<IdxBizJgRegisterInfo> registerInfoList = initializeList();
+        List<IdxBizJgSupervisionInfo> supervisionInfoList = initializeList();
+        List<IdxBizJgOtherInfo> otherInfoList = initializeList();
+        List<IdxBizJgInspectionDetectionInfo> inspectionDetectionInfoList = initializeList();
+        List<IdxBizJgTechParamsPipeline> paramsPipelineList = initializeList();
+        List<ESEquipmentCategoryDto> esEquipmentCategoryList = initializeList();
 
         //设备信息
         for (Map<String, Object> pipeline : pipelineList) {

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

@@ -3839,15 +3839,42 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         Set<String> proIds = flowIngPros.stream().map(JgUseRegistration::getProjectContraptionId).collect(toSet());
         proIds.remove(null);
         proIds.remove("");
-        // 查询已纳管且使用登记证编号为空或者null且非流程中的装置
+        // 查询已纳管且使用登记证编号不为空且非流程中的装置
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode,useUnitCreditCode);
         wrapper.eq(IdxBizJgProjectContraption::getIsIntoManagement, true);
         wrapper.notIn(!proIds.isEmpty(), BaseEntity::getSequenceNbr, proIds);
+        wrapper.isNull(IdxBizJgProjectContraption::getProjectContraptionParentId);
         wrapper.last("and (length(use_registration_code) = 0 or use_registration_code is null)");
         return jgProjectContraptionService.page(page, wrapper);
     }
 
+    public IPage<IdxBizJgProjectContraption> jgProjectContraptionPageMaster(String useUnitCreditCode, Page<IdxBizJgProjectContraption> page) {
+        // 兼容个人业务
+        if(useUnitCreditCode.contains("_")){
+            useUnitCreditCode = useUnitCreditCode.split("_")[1];
+        }
+        // 查询流程中的装置
+        List<JgUseRegistration> flowIngPros = this.list(
+                new LambdaQueryWrapper<JgUseRegistration>()
+                        .notIn(JgUseRegistration::getStatus, NOT_FLOWING_STATE)
+                        .select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId)
+        );
+        Set<String> proIds = flowIngPros.stream()
+                .map(JgUseRegistration::getProjectContraptionId)
+                .filter(id -> id != null && !id.isEmpty()) // 过滤 null 和空字符串
+                .collect(toSet());
+        // 查询已纳管且使用登记证编号为空或 null，非流程中的装置，或首次合并为 true
+        LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
+                .eq(IdxBizJgProjectContraption::getIsIntoManagement, true)
+                .notIn(!proIds.isEmpty(), BaseEntity::getSequenceNbr, proIds)
+                .and(w -> w.isNull(IdxBizJgProjectContraption::getUseRegistrationCode)
+                        .or().eq(IdxBizJgProjectContraption::getUseRegistrationCode, "")
+                        .or().eq(IdxBizJgProjectContraption::getIsFirstMerge, true));
+        return jgProjectContraptionService.page(page, wrapper);
+    }
+
     public Map<String, Object> getDeviceListByProjectContraption(String projectContraptionSeq) {
         IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getById(projectContraptionSeq);
         Map<String, Object> re = new HashMap<>();

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgProjectContraption.java

@@ -262,4 +262,16 @@ public class IdxBizJgProjectContraption extends BaseEntity {
      */
     @TableField("use_date")
     private String useDate;
+
+    /**
+     * 工程装置父级ID（合并用）
+     */
+    @TableField("project_contraption_parent_id")
+    private String projectContraptionParentId;
+
+    /**
+     * 是否首次合并新增
+     */
+    @TableField("is_first_merge")
+    private Boolean isFirstMerge;
 }