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
8da9b903
Commit
8da9b903
authored
Mar 29, 2024
by
韩桐桐
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(ymt && jg):注册信息表添加是否车用气瓶字段,jg设备查询添加“是否车用气瓶”查询条件
parent
f19322ce
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
IdxBizJgRegisterInfoServiceImpl.java
.../jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
+7
-0
ESEquipmentCategoryDto.java
.../amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java
+3
-0
IdxBizJgRegisterInfo.java
...amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java
+9
-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 @
8da9b903
...
...
@@ -1256,6 +1256,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
pBuilder
.
must
(
QueryBuilders
.
termQuery
(
"EQU_CATEGORY_CODE"
,
test
));
boolMust
.
must
(
pBuilder
);
}
// 是否车用气瓶
if
(!
ObjectUtils
.
isEmpty
(
map
.
getString
(
"WHETHER_VEHICLE_CYLINDER"
)))
{
BoolQueryBuilder
pBuilder
=
QueryBuilders
.
boolQuery
();
String
test
=
QueryParser
.
escape
(
map
.
getString
(
"WHETHER_VEHICLE_CYLINDER"
));
pBuilder
.
must
(
QueryBuilders
.
termQuery
(
"WHETHER_VEHICLE_CYLINDER"
,
test
));
boolMust
.
must
(
pBuilder
);
}
builder
.
query
(
boolMust
);
...
...
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/ESEquipmentCategoryDto.java
View file @
8da9b903
...
...
@@ -129,4 +129,7 @@ public class ESEquipmentCategoryDto {
@Field
(
type
=
FieldType
.
Text
)
private
String
DATA_SOURCE
;
@Field
(
type
=
FieldType
.
Text
)
private
String
WHETHER_VEHICLE_CYLINDER
;
}
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java
View file @
8da9b903
...
...
@@ -169,4 +169,13 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
@TableField
(
"\"OTHER_ACCESSORIES_REG\""
)
private
String
otherAccessoriesReg
;
/**
* 是否车用气瓶(特种气瓶用于区分“内装填料气瓶、纤维缠绕气瓶、低温绝热气瓶”和车用气瓶)
* 1:是
* 0:不是
*/
@TableField
(
"\"WHETHER_VEHICLE_CYLINDER\""
)
private
String
whetherVehicleCylinder
;
}
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