From 84453dac0672b9ce1b0acaf8f0bc99996f8fae1f Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 21 Jun 2024 16:03:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/bo/SysOssTextbookBo.java | 2 ++ .../impl/SysOssTextbookServiceImpl.java | 31 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java index 4edf61d..8a34b24 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java @@ -48,5 +48,7 @@ public class SysOssTextbookBo extends BaseEntity { */ private Integer status; + private String orderByColumn; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index cdf8ed2..8033d34 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -108,18 +108,25 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { ids.add(bo.getCatalogId()); w.in("ot.catalog_id", ids); }); - if (ObjectUtil.isNotNull(bo.getParams().get("downloadDesc"))) { - wrapper.orderByDesc("ot.download_num"); - } else if (ObjectUtil.isNotNull(bo.getParams().get("downloadAsc"))) { - wrapper.orderByAsc("ot.download_num"); - } else if (ObjectUtil.isNotNull(bo.getParams().get("previewDesc"))) { - wrapper.orderByDesc("ot.preview_num"); - } else if (ObjectUtil.isNotNull(bo.getParams().get("previewAsc"))) { - wrapper.orderByAsc("ot.preview_num"); - } else if (ObjectUtil.isNotNull(bo.getParams().get("timeAsc"))) { - wrapper.orderByAsc("ot.create_time"); - } else { - wrapper.orderByDesc("ot.create_time"); + String orderByColumn = bo.getOrderByColumn(); + switch (orderByColumn) { + case "downloadDesc": + wrapper.orderByDesc("ot.download_num"); + break; + case "downloadAsc": + wrapper.orderByAsc("ot.download_num"); + break; + case "previewDesc": + wrapper.orderByDesc("ot.preview_num"); + break; + case "previewAsc": + wrapper.orderByAsc("ot.preview_num"); + break; + case "timeAsc": + wrapper.orderByAsc("ot.create_time"); + break; + default: + wrapper.orderByDesc("ot.create_time"); } return wrapper; }