模板查询接口增加排序类型

eas-manager/doc/api.md

@@ -1811,6 +1811,7 @@ msg|String|消息|-
 参数名称|类型|必填|描述
 :---|:---|:---|:------
 masterplateName|String|否|模板名称
+orderType|Integer|否|排序类型 1：综合排序，2：热门下载，3：最新上传
 page|Integer|否|当前页
 size|Integer|否|每页条数，值为-1，查询所有记录
 

eas-manager/src/main/java/com/mortals/xhx/module/design/model/vo/DesignMasterplateVo.java

@@ -19,4 +19,7 @@ public class DesignMasterplateVo extends BaseEntityLong {
 
     /** 设计内容 */
     private List<JSONObject> designContent;
+
+    /** 排序类型 1：综合排序，2：热门下载，3：最新上传 */
+    private Integer orderType;
 }
\ No newline at end of file

eas-manager/src/main/java/com/mortals/xhx/module/design/web/DesignMasterplateController.java

@@ -58,8 +58,14 @@ public class DesignMasterplateController extends BaseCRUDJsonBodyMappingControll
     @Override
     protected void doListBefore(DesignMasterplateEntity query, Map<String, Object> model, Context context) throws AppException {
         Map<String,String> orderCols = new HashMap<>();
-        orderCols.put("createTime","DESC");
-        query.setOrderCols(orderCols);
+        if(query.getOrderType()==null||query.getOrderType()==3) {
+            orderCols.put("createTime", "DESC");
+            query.setOrderCols(orderCols);
+        }else if(query.getOrderType()==1||query.getOrderType()==2) {
+            orderCols.put("masterplateUseNum", "DESC");
+            orderCols.put("createTime", "DESC");
+            query.setOrderCols(orderCols);
+        }
     }
 
     @Override