fix(jg):撬装式压力容器的使用登记单位办理调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -481,7 +481,7 @@
 
     <select id="queryForUnitPipelineEquipment" resultType="java.util.Map">
         <include refid="page-list-pipeline"/>
-        WHERE ri."EQU_CATEGORY" = '8300' and ui."DATA_SOURCE" = 'jg'
+        WHERE ui."DATA_SOURCE" = 'jg'
         and ui.record in
         <foreach collection="records" item="record" open="(" close=")" separator=",">
             #{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/CommonServiceImpl.java

@@ -1052,14 +1052,16 @@ public class CommonServiceImpl implements ICommonService {
             JSONObject jsonObject = new JSONObject(provideMap);
             return jgTransferNoticeService.saveNotice(submitType, jsonObject, reginParams);
         } else if (type.equals(ApplicationFormTypeEnum.SYDJ.getBusinessCode())) {
-            String code = (String) basicObj.get("businessScenarios");
+            String businessScenarios = (String) basicObj.get("businessScenarios");
+            String code = (String) basicObj.get("code");
             noticeObj.put("receiveOrgCode", !ObjectUtils.isEmpty(basicObj.get("receiveOrgCreditCode")) ? String.valueOf(basicObj.get("receiveOrgCreditCode")) : String.valueOf(basicObj.get("receiveOrgCreditCode1")));
             JSONObject jsonObject = new JSONObject(noticeObj);
             if (submitType.equals("1")) {
                 jsonObject.put("submit", Boolean.TRUE);
             }
             // 判断是否为车用气瓶使用登记或者设备使用登记
-            return code != null && code.equals("1") ? jgVehicleInformationService.save(submitType, jsonObject) : jgUseRegistrationServiceImpl.save(jsonObject);
+            return "1".equals(businessScenarios) && CylinderTypeEnum.CYLINDER.getCode().equals(code) ?
+                    jgVehicleInformationService.save(submitType, jsonObject) : jgUseRegistrationServiceImpl.save(jsonObject);
         } else if (type.equals(ApplicationFormTypeEnum.GZBG.getBusinessCode())) {
             // 兼容业务逻辑代码
             if (submitType.equals("1")) {

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

@@ -121,6 +121,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String WHETHER_VEHICLE_CYLINDER = "WHETHER_VEHICLE_CYLINDER";
     // 是否撬装式压力容器
     public static final String WHETHER_SKID_MOUNTED_PRESSURE_VESSEL = "WHETHER_SKID_MOUNTED_PRESSURE_VESSEL";
+    // 检验检测机构
+    public static final String INSPECTION_AND_TESTING_INSTITUTIONS = "检验检测机构";
     // 需要转化成jsonObject的附件字段
     public static String[] jsonFields = {"insOtherAccessories", "installContractAttachment", "installProxyStatementAttachment"};
     @Autowired
@@ -1703,6 +1705,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         // 检验检测
         IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
+        List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
+        Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
+        Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
+        inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgCode()));
         inspectionDetectionInfo.setRecord(record);
         inspectionDetectionInfo.setRecDate(date);
         inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));