Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -3159,8 +3159,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 }
                 inspectionDetectionInfo.setSequenceNbr(String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
                 iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
-            } else if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory) || "8300".equals(equCategory)) {
-                //更新时 固定式压力容器（2100）和 气瓶（2300）工业管道（8300） 可以更新检验检测信息
+            } else if (CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory)) {
+                //更新时 固定式压力容器（2100）和 气瓶（2300）可以更新检验检测信息
                 IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
                 List<Map<String, Object>> inspectionAndTestingInstitutions = commonService.getUnitListByType("inspection", "gasCylindersForCars");
                 Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
@@ -3204,9 +3204,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 }
             }
         }
-        if ("8300".equals(equCategory)) {
-            useInfo.setProjectContraption(((String) equipmentInfoForm.get("PROJECT_CONTRAPTION")).trim());
-        }
         idxBizJgUseInfoService.saveOrUpdateData(useInfo);
 
         // 设计信息
@@ -3538,21 +3535,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         jsonObject.put("useUnitCreditCode", useUnitCreditCode);
         Page<JSONObject> page = new Page<>(jsonObject.getLong("number"), jsonObject.getLong("size"));
         Set<String> records = EquipUsedCheckStrategyContext.getUsedStrategy("useRegistration").getEquipInFlow(useUnitCreditCode);
-        if ("8300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 管道
-            if (jsonObject.get("projectContraption") == null) {
-                throw new BadRequest("请先选择工程装置后，再选择设备信息！");
-            }
-            if (!jgUseRegistrationMapper.selectList(new LambdaQueryWrapper<JgUseRegistration>()
-                    .eq(JgUseRegistration::getIsDelete, false)
-                    .eq(JgUseRegistration::getProjectContraption, jsonObject.get("projectContraption"))
-                    .eq(JgUseRegistration::getUseUnitCreditCode, useUnitCreditCode)
-                    .eq(JgUseRegistration::getIsAddEquip, "0")
-                    .eq(JgUseRegistration::getStatus, "已完成")
-                    .ne(JgUseRegistration::getStatus, "已作废")).isEmpty() && "0".equals(jsonObject.get("isAddEquip"))) {
-                throw new BadRequest("该工程装置已做过使用登记，再选择增补功能进行登记！");
-            }
-            return jgUseRegistrationMapper.queryForUnitPipelineEquipmentPage(page, jsonObject, records);
-        } else if ("2300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 气瓶
+        if ("2300".equals(jsonObject.get(EQU_CATEGORY_CODE))) {// 气瓶
             List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
             Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataValue));
             Page<JSONObject> result = jgUseRegistrationMapper.queryForUnitVesselEquipmentPage(page, jsonObject, records);