Commit 303bb239 authored by 韩桐桐's avatar 韩桐桐

fix(jg):es查询设备添加工程装置名称的过滤条件

parent 2f682a99
......@@ -1375,6 +1375,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
this.setRepeatUsedCheckFilterParam(boolMust, companyCode, "installNotice");
// 安装告知设备选择 - 业务限制
// 根据设备类别(EQU_CATEGORY)、安装单位过滤设备(USC_UNIT_CREDIT_CODE) 下面过滤条件已有
// 设备类别为工业管道(8300)时,用工程装置名称过滤
if (!ValidationUtil.isEmpty(EQU_CATEGORY_CODE) && ValidationUtil.equals(EQU_CATEGORY_CODE, "8300")) {
if (ValidationUtil.isEmpty(map.get("projectContraption"))) {
throw new BadRequest("请先选择工程装置信息!");
}
map.put(PROJECT_CONTRAPTION, String.valueOf(map.get("projectContraption")));
}
} else if (ValidationUtil.equals(queryType, "WB")) {// 维保
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null || "")】
BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
......
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