279-bug修改

adc-da-search/src/main/java/com/adc/da/search/entity/SeniorSearchInfoEO.java

@@ -277,5 +277,6 @@ public class SeniorSearchInfoEO extends BasePage {
     private String standId;
 
 
+    private String clientType; // 客户端类型：空-web端， 2-手机端
 
 }

adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java

@@ -1645,6 +1645,10 @@ public class SearchCenterServiceImpl implements SearchCenterService {
 //            queryBuilder1 = QueryBuilders.multiMatchQuery(searchInfoEO.getSelectValue(),
 //                    "title"
 //            ).minimumShouldMatch("100%").field("title",1000f);
+
+            if ("2".equals(searchInfoEO.getClientType())) {
+                boolQueryBuilder.mustNot(QueryBuilders.termQuery("standTypeOrder", "3"));
+            }
             boolQueryBuilder.must(boolQueryShould);
         }
 
@@ -1684,9 +1688,9 @@ public class SearchCenterServiceImpl implements SearchCenterService {
         searchRequestBuilder = client.prepareSearch("fulltextserch")
                 .setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
                 .highlighter(hiBuilder)
-                .addSort(new ScoreSortBuilder().order(SortOrder.DESC))
                 .addSort("standTypeOrder",SortOrder.ASC)
                 .addSort("standSortOrder",SortOrder.ASC)
+                .addSort(new ScoreSortBuilder().order(SortOrder.DESC))
                 .addSort("numberTitle",SortOrder.ASC)
                 .addSort("yearOrder.keyword",SortOrder.DESC)
                 .addSort("sortTitle.keyword",SortOrder.ASC)