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
2b27ec2f
Commit
2b27ec2f
authored
Jul 10, 2025
by
tianyiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
c486a859
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
5 deletions
+24
-5
EsBaseEnterpriseInfo.java
...s/boot/module/common/api/entity/EsBaseEnterpriseInfo.java
+7
-1
EsUserInfo.java
...eejoin/amos/boot/module/common/api/entity/EsUserInfo.java
+10
-4
ComprehensiveStatisticalAnalysisServiceImpl.java
...ice/impl/ComprehensiveStatisticalAnalysisServiceImpl.java
+7
-0
No files found.
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsBaseEnterpriseInfo.java
View file @
2b27ec2f
...
...
@@ -107,11 +107,17 @@ public class EsBaseEnterpriseInfo {
/**
* 涉及设备类型
* 涉及设备类型
code
*/
@Field
(
type
=
FieldType
.
Keyword
)
private
String
equipCategory
;
/**
* 涉及设备类型名称
*/
@Field
(
type
=
FieldType
.
Keyword
)
private
String
equipCategoryName
;
/**
* 公司的orgCode
...
...
amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/EsUserInfo.java
View file @
2b27ec2f
...
...
@@ -60,7 +60,7 @@ public class EsUserInfo {
/**
* 岗位名称-按照new_post显示
*/
@Field
(
type
=
FieldType
.
Text
)
@Field
(
type
=
FieldType
.
Keyword
)
private
String
postName
;
/**
...
...
@@ -136,12 +136,18 @@ public class EsUserInfo {
private
String
profile
;
/**
* 设备类型
* 设备类型
code
*/
@Field
(
type
=
FieldType
.
Keyword
)
private
String
equipType
;
/**
* 设备类型名称
*/
@Field
(
type
=
FieldType
.
Keyword
)
private
String
equipTypeName
;
/**
* 职称
*/
@Field
(
type
=
FieldType
.
Keyword
)
...
...
@@ -156,7 +162,7 @@ public class EsUserInfo {
/**
* 岗位子类型名称(多个逗号分割)
*/
@Field
(
type
=
FieldType
.
Text
)
@Field
(
type
=
FieldType
.
Keyword
)
private
String
subPostName
;
/**
...
...
@@ -168,7 +174,7 @@ public class EsUserInfo {
/**
* 管辖机构名称--来源企业表
*/
@Field
(
type
=
FieldType
.
Text
)
@Field
(
type
=
FieldType
.
Keyword
)
private
String
superviseOrgName
;
/**
...
...
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/ComprehensiveStatisticalAnalysisServiceImpl.java
View file @
2b27ec2f
...
...
@@ -380,6 +380,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
String
fuzzyValue
=
String
.
valueOf
(
v
);
BoolQueryBuilder
queryBuilder
=
QueryBuilders
.
boolQuery
();
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"name"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"postName"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"subPostName"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"unitName"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"equipCategoryName"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"superviseOrgName"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"address"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
minimumShouldMatch
(
1
);
boolMust
.
must
(
queryBuilder
);
}
else
if
(
k
.
equals
(
"unitCategory"
))
{
...
...
@@ -588,6 +594,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"useUnit.keyword"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"address.keyword"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"superviseOrgName.keyword"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"equipCategoryName.keyword"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
should
(
QueryBuilders
.
wildcardQuery
(
"contactUser.keyword"
,
"*"
+
fuzzyValue
+
"*"
));
queryBuilder
.
minimumShouldMatch
(
1
);
boolMust
.
must
(
queryBuilder
);
...
...
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