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-13 09:08:40 +08:00
parent ad68c11ab1
commit ec72e577f4
4 changed files with 35 additions and 24 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
+23 -22
View File
@@ -241,25 +241,25 @@ public class SearchCenterServiceImpl implements SearchCenterService {
sortField2 = "standYear";
sortField3 = "standSort.keyword";
}
// if("laws".equals(searchInfoEO.getSelectIndex())){
// sortField1 = "lawsNumber";
// sortField2 = "lawsYear";
// sortField3 = "lawsType.keyword";
// } else if("bussstand".equals(searchInfoEO.getSelectIndex())) {
// sortField1 = "putTime";
// sortField2 = "standNumber";
// sortField3 = "standYear";
// sortField4 = "standSort.keyword";
// } else if ("stand".equals(searchInfoEO.getSelectIndex())) {
// sortField1 = "SSRQ";
// sortField2 = "standNumber";
// sortField3 = "standYear";
// sortField4 = "standSort.keyword";
// } else {
// sortField1 = "standNumber";
// sortField2 = "standYear";
// sortField3 = "standSort.keyword";
// }
if("laws".equals(searchInfoEO.getSelectIndex())){
sortField1 = "lawsNumber";
sortField2 = "lawsYear";
sortField3 = "lawsType.keyword";
} else if("bussstand".equals(searchInfoEO.getSelectIndex())) {
sortField1 = "put_time_data";
sortField2 = "standNumber";
sortField3 = "standYear";
sortField4 = "standSort.keyword";
} else if ("stand".equals(searchInfoEO.getSelectIndex())) {
sortField1 = "SSRQName";
sortField2 = "standNumber";
sortField3 = "standYear";
sortField4 = "standSort.keyword";
} else {
sortField1 = "standNumber";
sortField2 = "standYear";
sortField3 = "standSort.keyword";
}
// 国内海外查询标准体系字段由id变为文字
// if (StringUtils.isNotBlank(searchInfoEO.getStandSystem())) {
@@ -307,10 +307,11 @@ 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)
.addSort("standSortOrder", SortOrder.ASC)
.addSort(sortField1, SortOrder.ASC)
.addSort(sortField2, SortOrder.DESC)
.addSort(sortField3, SortOrder.ASC)
.addSort(sortField2, SortOrder.ASC)
.addSort(sortField3, SortOrder.DESC)
.addSort(sortField4, SortOrder.ASC)
.addSort("issue_time_data", SortOrder.DESC)
.setSize(searchInfoEO.getPageSize());