fix(jg)：【现场需求】气瓶充装介质添加 >>>溶解乙炔 Dissolve_Acetylene 介质 <<<

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/EquipInfoCylinderExcelDto.java

@@ -179,7 +179,7 @@ public class EquipInfoCylinderExcelDto extends BaseDto {
     @ApiModelProperty(value = "型号")
     private String modelNumber;
 
-    @ExcelProperty(value = "充装介质", index = 31, converter = ChargingMediumConverter.class)
+    @ExcelProperty(value = "充装介质", index = 31)
     @ApiModelProperty(value = "充装介质")
     @NotBlank(message = "充装介质不能为空")
     private String chargingMedium;

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

@@ -1614,7 +1614,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         // 工程装置名称模糊查询
         if (!ObjectUtils.isEmpty(map.getString(PROJECT_CONTRAPTION))) {
             BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION).toLowerCase()));
+            pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION)));
             boolMust.must(pBuilder);
         }
         builder.query(boolMust);
@@ -2652,7 +2652,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     equCodeList.add(data.getEquCode());
                     factoryNumList.add("0".equals(data.getWhetherVehicleCylinder()) ? data.getFactoryNum() : null);
                 }
-
                 // 全部读取完成就调用该方法
                 @Override
                 public void doAfterAllAnalysed(AnalysisContext context) {
@@ -2818,10 +2817,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             otherInfoList.add(otherInfo);
 
             // 技术参数
+            List<DictionarieValueModel> fillingMedium = Systemctl.dictionarieClient.dictValues("FILLING_MEDIUM").getResult();
+            Map<String, Object> fillingMediumMap = fillingMedium.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataValue,
+                    DictionarieValueModel::getDictDataKey));
             IdxBizJgTechParamsVessel paramsVessel = new IdxBizJgTechParamsVessel();
             BeanUtils.copyProperties(data, paramsVessel);
             paramsVessel.setRecord(record);
             paramsVessel.setRecDate(new Date());
+            paramsVessel.setChargingMedium((String) fillingMediumMap.get(data.getChargingMedium()));
             paramsVesselList.add(paramsVessel);
 
             ESEquipmentCategoryDto esEquipmentDto = JSON.parseObject(toJSONString(data), ESEquipmentCategoryDto.class);