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
973a3054
Commit
973a3054
authored
Aug 21, 2024
by
tianbo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_tzs_register_to_0715' into develop_tzs_register
parents
a3aa353d
c256f715
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CommonMapper.xml
...-module-jg-api/src/main/resources/mapper/CommonMapper.xml
+0
-0
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+4
-4
No files found.
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml
View file @
973a3054
This diff is collapsed.
Click to expand it.
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 @
973a3054
...
...
@@ -1395,10 +1395,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
map
.
put
(
PROJECT_CONTRAPTION
,
String
.
valueOf
(
map
.
get
(
"projectContraption"
)));
}
}
else
if
(
ValidationUtil
.
equals
(
queryType
,
"WB"
))
{
// 维保
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null || "")】
BoolQueryBuilder
wbBuilder
=
QueryBuilders
.
boolQuery
();
wbBuilder
.
mustNot
(
QueryBuilders
.
existsQuery
(
"EQU_STATE"
));
boolMust
.
must
(
wbBuilder
);
//
// 查询 维保备案【可绑定设备列表】【(EQU_STATE=== null || "")】
//
BoolQueryBuilder wbBuilder = QueryBuilders.boolQuery();
//
wbBuilder.mustNot(QueryBuilders.existsQuery("EQU_STATE"));
//
boolMust.must(wbBuilder);
}
else
if
(
ValidationUtil
.
equals
(
queryType
,
"SY"
))
{
// 使用
// 查询 使用登记【可选设备列表】【(EQU_STATUS=== null || "" ) && (USE_ORG_CODE(使用登记证编号) ==="" || null)】
BoolQueryBuilder
syBuilder
=
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