搜索排序

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/content/ContentMaterialController.java

@@ -11,6 +11,7 @@ import com.gic.content.api.dto.material.ContentMaterialDTO;
 import com.gic.content.api.dto.material.ContentMaterialLikeDTO;
 import com.gic.content.api.dto.material.ContentMaterialShareInfoDTO;
 import com.gic.content.api.enums.ColumnEnum;
+import com.gic.content.api.enums.MaterialOrderFieldEnum;
 import com.gic.content.api.qdto.column.ContentColumnClerkQDTO;
 import com.gic.content.api.qdto.like.ContentMaterialLikeQDTO;
 import com.gic.content.api.qdto.material.ContentMaterialPageQDTO;
@@ -29,6 +30,7 @@ import com.gic.haoban.manage.web.utils.storestatusfilter.StoreStatusFilterUtils;
 import com.gic.haoban.manage.web.vo.content.*;
 import com.gic.haoban.manage.web.vo.content.statistics.ContentMaterialKnowVO;
 import com.gic.store.goods.enums.ThirdTypeEnum;
+import com.google.common.collect.Lists;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -123,6 +125,7 @@ public class ContentMaterialController {
         pageQDTO.setClerkId(contentMaterialQO.getClerkId());
         pageQDTO.setGoodsId(contentMaterialQO.getGoodsId());
         pageQDTO.setContentMaterialIdList(contentMaterialQO.getContentMaterialIdList());
+        pageQDTO.setOrderFieldList(contentMaterialQO.getOrderFieldList());
 
         if (contentMaterialQO.getSortType() != null) {
             if (contentMaterialQO.getSortType() == 2) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/content/ContentMaterialQO.java

 package com.gic.haoban.manage.web.qo.content;
 
 import com.gic.commons.web.qo.PageQo;
+import com.gic.content.api.enums.MaterialOrderFieldEnum;
 import com.gic.content.api.enums.MaterialSearchSceneEnum;
 
 import java.util.List;
@@ -77,6 +78,12 @@ public class ContentMaterialQO extends PageQo {
 
     private Integer storeStatusFilter;
 
+    /**
+     * 排序字段
+     * @see MaterialOrderFieldEnum
+     */
+    private List<String> orderFieldList;
+
     public Integer getQueryScene() {
         return queryScene;
     }
@@ -180,4 +187,12 @@ public class ContentMaterialQO extends PageQo {
     public void setStoreStatusFilter(Integer storeStatusFilter) {
         this.storeStatusFilter = storeStatusFilter;
     }
+
+    public List<String> getOrderFieldList() {
+        return orderFieldList;
+    }
+
+    public void setOrderFieldList(List<String> orderFieldList) {
+        this.orderFieldList = orderFieldList;
+    }
 }