Merge remote-tracking branch 'origin/develop_master' into develop_1

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")) {

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;
+
+
 
 }