修改bug

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

@@ -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

@@ -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

@@ -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);