Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
303bb239
Commit
303bb239
authored
Jul 25, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):es查询设备添加工程装置名称的过滤条件
parent
2f682a99
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+7
-0
No files found.
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
View file @
303bb239
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment