From 271e8860d6e020806080be9e1decb95732aac5fe Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 10 Aug 2021 17:23:00 +0800 Subject: [PATCH 1/2] feat:There is no way the issueTime sort desc --- .../com/adc/da/search/service/impl/SearchCenterServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java index 88bf234f..9302e1f1 100644 --- a/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java +++ b/adc-da-search/src/main/java/com/adc/da/search/service/impl/SearchCenterServiceImpl.java @@ -25,6 +25,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.StringTerms; import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder; import org.elasticsearch.search.fetch.subphase.highlight.HighlightField; +import org.elasticsearch.search.sort.SortOrder; import org.json.JSONTokener; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -79,6 +80,7 @@ public class SearchCenterServiceImpl implements SearchCenterService { searchRequestBuilder = client.prepareSearch(searchInfoEO.getSelectIndex()) .setSearchType(SearchType.DFS_QUERY_THEN_FETCH) .setFrom((searchInfoEO.getPage()-1)*searchInfoEO.getPageSize()) + .addSort("issueTime", SortOrder.DESC) .setSize(searchInfoEO.getPageSize()); if(searchInfoEO.getSelectIndex().equals("stand")) { From fb860e347d8be2c2c0e63bd4b62b852bb561272b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 10 Aug 2021 17:57:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adc/da/slrs/sarStandItems/entity/SarStandItems.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java index b05f19aa..fb6929d3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarStandItems.java @@ -172,5 +172,14 @@ public class SarStandItems extends BaseEntity { private String responsibleEngineer; + @ApiModelProperty(value = "相对于上一版本变化点") + @TableField("compared_with_previous") + private String comparedWithPrevious; + + @ApiModelProperty(value = "合规性分析") + @TableField("compliance_state") + private String complianceState; + + }