From a21b007cfacc41fd81510a28aa58b44b6c9844a5 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 21 Oct 2019 19:12:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/invest/InvestPageQuery.java | 4 ++-- .../iformall/service/invest/InvestHelper.java | 23 ++++++++----------- .../invest/impl/InvestBizServiceImpl.java | 4 ++-- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java index 33cc96340..9b91eaf08 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java @@ -19,10 +19,10 @@ public class InvestPageQuery { @io.swagger.annotations.ApiModelProperty(value = "倒序字段集合", name = "descs") - private List descs; + private String sortColumn; @io.swagger.annotations.ApiModelProperty(value = "升序字段集合", name = "ascs") - private List ascs; + private String sortOrder; private T queryData ; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index c159b5eb5..e6ff4cc61 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils; import java.lang.reflect.Method; import java.text.MessageFormat; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -28,23 +25,21 @@ public class InvestHelper { Page page = new Page<>(); page.setCurrent(pageQuery.getPageNum()); page.setSize(pageQuery.getPageSize()); - page.setAscs(camelToUnderline(pageQuery.getAscs())); - page.setDescs(camelToUnderline(pageQuery.getDescs())); + camelToUnderline(pageQuery.getSortColumn(), pageQuery.getSortOrder(), page); page.setOptimizeCountSql(true); page.setSearchCount(true); return page; } - private static List camelToUnderline(List orders) { - if (CollectionUtils.isEmpty(orders)) { - return orders; + private static void camelToUnderline(String sortColumn, String sortOrder, Page page) { + if (StringUtils.isEmpty(sortColumn)) { + return; } - - List newOrders = Lists.newArrayList(); - for (String order : orders) { - newOrders.add(StringUtils.camelToUnderline(order)); + if (Objects.equals(sortOrder, "desc")) { + page.setDesc(sortColumn); + } else { + page.setAsc(sortColumn); } - return newOrders; } /** diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 620a9646c..03315ca07 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -128,7 +128,7 @@ public class InvestBizServiceImpl implements InvestBizService { } LambdaQueryWrapper taskQueryWrapper = new LambdaQueryWrapper<>(); InvestPageResult investPage = new InvestPageResult<>(); - taskQueryWrapper.apply(StringUtils.isNotEmpty(taskParams.getOwner()), "`owner` REGEXP {0}", taskParams.getOwner()); + taskQueryWrapper.apply(StringUtils.isNotBlank(taskParams.getOwner()), "`owner` REGEXP {0}", taskParams.getOwner()); taskParams.setOwner(null); taskQueryWrapper.setEntity(taskParams); @@ -191,7 +191,7 @@ public class InvestBizServiceImpl implements InvestBizService { private InvestTaskDto doConvertTask(InvestTaskQuery params) { InvestTaskEntity task = new InvestTaskEntity(); - if (Objects.nonNull(params.getTaskOwner())) { + if (StringUtils.isNotBlank(params.getTaskOwner())) { task.setOwner(params.getTaskOwner()); } else { task.setOwner(Objects.isNull(InvestUserContext.getDataUser()) ? "" : String.valueOf(InvestUserContext.getDataUser()));