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
9d8721b2
Commit
9d8721b2
authored
Aug 19, 2024
by
刘林
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(jg):设备添加气瓶分类
parent
00986f54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
2 deletions
+16
-2
ZLDPStatisticsServiceImpl.java
...statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
+5
-2
equipCategory.json
...module-ymt-biz/src/main/resources/json/equipCategory.json
+11
-0
No files found.
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
View file @
9d8721b2
...
...
@@ -842,8 +842,11 @@ public class ZLDPStatisticsServiceImpl {
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_LIST_CODE"
)))
{
BoolQueryBuilder
meBuilder
=
QueryBuilders
.
boolQuery
();
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"EQU_LIST_CODE"
));
meBuilder
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_LIST_CODE"
,
test
));
if
(
"2300"
.
equals
(
map
.
getString
(
"EQU_LIST_CODE"
)))
{
meBuilder
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_CATEGORY_CODE"
,
QueryParser
.
escape
(
map
.
getString
(
"EQU_CATEGORY_CODE"
))));
}
else
{
meBuilder
.
must
(
QueryBuilders
.
matchPhraseQuery
(
"EQU_LIST_CODE"
,
QueryParser
.
escape
(
map
.
getString
(
"EQU_LIST_CODE"
))));
}
boolMust
.
must
(
meBuilder
);
}
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"EQU_LIST"
)))
{
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/resources/json/equipCategory.json
View file @
9d8721b2
...
...
@@ -88,6 +88,17 @@
"refuseClaim"
:
"0"
,
"sum"
:
"0"
,
"type"
:
"ropeway"
},
{
"name"
:
"气瓶"
,
"code"
:
"2300"
,
"image"
:
"upload/tzs/common/image/总览压力容器.png"
,
"imageUrl"
:
"upload/tzs/common/image/监管压力容器.png"
,
"waitClaim"
:
"0"
,
"alreadyClaim"
:
"0"
,
"refuseClaim"
:
"0"
,
"sum"
:
"0"
,
"type"
:
"vessel"
}
],
"__other__"
:
"监管业务使用"
,
...
...
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