Commit 8da9b903 authored by 韩桐桐's avatar 韩桐桐

fix(ymt && jg):注册信息表添加是否车用气瓶字段,jg设备查询添加“是否车用气瓶”查询条件

parent f19322ce
......@@ -1256,6 +1256,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
pBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE",test));
boolMust.must(pBuilder);
}
// 是否车用气瓶
if (!ObjectUtils.isEmpty(map.getString("WHETHER_VEHICLE_CYLINDER"))) {
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("WHETHER_VEHICLE_CYLINDER"));
pBuilder.must(QueryBuilders.termQuery("WHETHER_VEHICLE_CYLINDER",test));
boolMust.must(pBuilder);
}
builder.query(boolMust);
......
......@@ -129,4 +129,7 @@ public class ESEquipmentCategoryDto {
@Field(type = FieldType.Text)
private String DATA_SOURCE;
@Field(type = FieldType.Text)
private String WHETHER_VEHICLE_CYLINDER;
}
......@@ -169,4 +169,13 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
@TableField("\"OTHER_ACCESSORIES_REG\"")
private String otherAccessoriesReg;
/**
* 是否车用气瓶(特种气瓶用于区分“内装填料气瓶、纤维缠绕气瓶、低温绝热气瓶”和车用气瓶)
* 1:是
* 0:不是
*/
@TableField("\"WHETHER_VEHICLE_CYLINDER\"")
private String whetherVehicleCylinder;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment