完善历史数据查询接口

src/main/java/com/gzzn/omms/adminapi/elasticsearch/ElasticsearchUtil.java

@@ -280,12 +280,13 @@ public class ElasticsearchUtil {
      * @param size           文档大小限制
      * @param fields         需要显示的字段，逗号分隔（缺省为全部字段）
      * @param sortField      排序字段
+     * @param sortOrder 
      * @param highlightField 高亮字段
      * @return
      */
     public static List<Map<String, Object>> searchListData(
             String index, String type, QueryBuilder query, Integer size,
-            String fields, String sortField, String highlightField) {
+            String fields, String sortField, SortOrder sortOrder, String highlightField) {
 
         SearchRequestBuilder searchRequestBuilder = client.prepareSearch(index);
         if (!StringUtils.isEmpty(type)) {
@@ -307,7 +308,10 @@ public class ElasticsearchUtil {
         searchRequestBuilder.setFetchSource(true);
 
         if (!StringUtils.isEmpty(sortField)) {
-            searchRequestBuilder.addSort(sortField, SortOrder.DESC);
+        	if(null==sortOrder){
+        		sortOrder = SortOrder.DESC;
+        	}
+            searchRequestBuilder.addSort(sortField, sortOrder);
         }
 
         if (size != null && size > 0) {