FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug: 搜索中心字段排序问题

Browse Source
This commit is contained in:
wxyclub
2023-11-20 14:59:52 +08:00
parent be6f977824
commit e2f436c66a
3 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java
+19 -15
View File
@@ -246,15 +246,15 @@ public class SearchCenterServiceImpl implements SearchCenterService {
sortField2 = "lawsYear";
sortField3 = "lawsType.keyword";
} else if("bussstand".equals(searchInfoEO.getSelectIndex())) {
sortField1 = "put_time_data";
sortField2 = "standNumber";
sortField3 = "standYear";
sortField4 = "standSort.keyword";
// sortField1 = "put_time_data";
sortField1 = "standNumber";
sortField2 = "standYear";
sortField3 = "standSort.keyword";
} else if ("stand".equals(searchInfoEO.getSelectIndex())) {
sortField1 = "SSRQName";
sortField2 = "standNumber";
sortField3 = "standYear";
sortField4 = "standSort.keyword";
// sortField2 = "standNumber";
// sortField3 = "standYear";
// sortField4 = "standSort.keyword";
} else {
sortField1 = "standNumber";
sortField2 = "standYear";
@@ -305,15 +305,19 @@ public class SearchCenterServiceImpl implements SearchCenterService {
}
searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex())
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH)
.addSort(new ScoreSortBuilder().order(SortOrder.DESC))
.addSort(sortField1, SortOrder.DESC)
.setSearchType(SearchType.DFS_QUERY_THEN_FETCH);
if ("stand".equals(searchInfoEO.getSelectIndex())) {
searchRequestBuilder.addSort(sortField1,SortOrder.DESC);
} else {
searchRequestBuilder.addSort(new ScoreSortBuilder().order(SortOrder.DESC))
.addSort("standSortOrder", SortOrder.ASC)
.addSort(sortField2, SortOrder.ASC)
.addSort(sortField3, SortOrder.DESC)
.addSort(sortField4, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC)
.setFrom((searchInfoEO.getPage()-1) * searchInfoEO.getPageSize())
.addSort(sortField1, SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC);
}
searchRequestBuilder.setFrom((searchInfoEO.getPage()-1) * searchInfoEO.getPageSize())
.setSize(searchInfoEO.getPageSize());
if(StringUtils.isNotEmpty(searchInfoEO.getSelectValue())){