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
3fd52a14
Commit
3fd52a14
authored
Apr 10, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):设备数据过滤;安装告知:匹配无使用单位code;维保备案:匹配无设备状态;使用登记:匹配设备状态为空且使用等级证编号为空的
parent
3c9a9e94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
10 deletions
+5
-10
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+5
-10
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 @
3fd52a14
...
...
@@ -1146,26 +1146,21 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
String
queryType
=
map
.
getString
(
"QUERY_TYPE"
);
if
(!
ObjectUtils
.
isEmpty
(
queryType
))
{
//查询 安装告知【可告知设备列表】【
EQU_STAT
E=== null】
//查询 安装告知【可告知设备列表】【
USE_UNIT_CREDIT_COD
E=== null】
if
(
ValidationUtil
.
equals
(
queryType
,
"AZ"
))
{
BoolQueryBuilder
azBuilder
=
QueryBuilders
.
boolQuery
();
azBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"
EQU_STAT
E"
));
azBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"
USE_UNIT_CREDIT_COD
E"
));
boolMust
.
must
(
azBuilder
);
}
else
if
(
ValidationUtil
.
equals
(
queryType
,
"WB"
))
{
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null)
&& (INSPECT_REPORT!=="" && !null)
】
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null)】
BoolQueryBuilder
wbBuilder
=
QueryBuilders
.
boolQuery
();
wbBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"EQU_STATE"
));
wbBuilder
.
must
(
QueryBuilders
.
existsQuery
(
"INSPECT_REPORT"
));
wbBuilder
.
mustNot
(
QueryBuilders
.
matchPhraseQuery
(
"INSPECT_REPORT"
,
""
));
boolMust
.
must
(
wbBuilder
);
}
else
if
(!
ObjectUtils
.
isEmpty
(
queryType
)
&&
ValidationUtil
.
equals
(
queryType
,
"SY"
))
{
//查询 使用登记【可选设备列表】【EQU_STATUS=== null && (
INSPECT_REPORT!=="" && !null) && (USE_ORG_CODE!=="" && !
null)】
//查询 使用登记【可选设备列表】【EQU_STATUS=== null && (
USE_ORG_CODE ==="" ||
null)】
BoolQueryBuilder
syBuilder
=
QueryBuilders
.
boolQuery
();
syBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"EQU_STATE"
));
syBuilder
.
must
(
QueryBuilders
.
existsQuery
(
"INSPECT_REPORT"
));
syBuilder
.
mustNot
(
QueryBuilders
.
matchPhraseQuery
(
"INSPECT_REPORT"
,
""
));
syBuilder
.
must
(
QueryBuilders
.
existsQuery
(
"USE_ORG_CODE"
));
syBuilder
.
mustNot
(
QueryBuilders
.
matchPhraseQuery
(
"USE_ORG_CODE"
,
""
));
syBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"USE_ORG_CODE"
));
boolMust
.
must
(
syBuilder
);
}
}
...
...
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