Sfoglia il codice sorgente

[招商]adjust

release_toaliyun_real
Burce 6 anni fa
parent
commit
a21b007cfa
3 ha cambiato i file con 13 aggiunte e 18 eliminazioni
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java
  2. +9
    -14
      mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestPageQuery.java Vedi File

@@ -19,10 +19,10 @@ public class InvestPageQuery<T> {




@io.swagger.annotations.ApiModelProperty(value = "倒序字段集合", name = "descs") @io.swagger.annotations.ApiModelProperty(value = "倒序字段集合", name = "descs")
private List<String> descs;
private String sortColumn;


@io.swagger.annotations.ApiModelProperty(value = "升序字段集合", name = "ascs") @io.swagger.annotations.ApiModelProperty(value = "升序字段集合", name = "ascs")
private List<String> ascs;
private String sortOrder;


private T queryData ; private T queryData ;
} }

+ 9
- 14
mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java Vedi File

@@ -14,10 +14,7 @@ import org.springframework.util.CollectionUtils;


import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.text.MessageFormat; 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.Function;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@@ -28,23 +25,21 @@ public class InvestHelper {
Page<T> page = new Page<>(); Page<T> page = new Page<>();
page.setCurrent(pageQuery.getPageNum()); page.setCurrent(pageQuery.getPageNum());
page.setSize(pageQuery.getPageSize()); page.setSize(pageQuery.getPageSize());
page.setAscs(camelToUnderline(pageQuery.getAscs()));
page.setDescs(camelToUnderline(pageQuery.getDescs()));
camelToUnderline(pageQuery.getSortColumn(), pageQuery.getSortOrder(), page);
page.setOptimizeCountSql(true); page.setOptimizeCountSql(true);
page.setSearchCount(true); page.setSearchCount(true);
return page; return page;
} }


private static List<String> camelToUnderline(List<String> orders) {
if (CollectionUtils.isEmpty(orders)) {
return orders;
private static void camelToUnderline(String sortColumn, String sortOrder, Page page) {
if (StringUtils.isEmpty(sortColumn)) {
return;
} }
List<String> 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;
} }


/** /**


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Vedi File

@@ -128,7 +128,7 @@ public class InvestBizServiceImpl implements InvestBizService {
} }
LambdaQueryWrapper<InvestTaskEntity> taskQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<InvestTaskEntity> taskQueryWrapper = new LambdaQueryWrapper<>();
InvestPageResult<InvestTaskVo> investPage = new InvestPageResult<>(); InvestPageResult<InvestTaskVo> 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); taskParams.setOwner(null);
taskQueryWrapper.setEntity(taskParams); taskQueryWrapper.setEntity(taskParams);


@@ -191,7 +191,7 @@ public class InvestBizServiceImpl implements InvestBizService {


private InvestTaskDto doConvertTask(InvestTaskQuery params) { private InvestTaskDto doConvertTask(InvestTaskQuery params) {
InvestTaskEntity task = new InvestTaskEntity(); InvestTaskEntity task = new InvestTaskEntity();
if (Objects.nonNull(params.getTaskOwner())) {
if (StringUtils.isNotBlank(params.getTaskOwner())) {
task.setOwner(params.getTaskOwner()); task.setOwner(params.getTaskOwner());
} else { } else {
task.setOwner(Objects.isNull(InvestUserContext.getDataUser()) ? "" : String.valueOf(InvestUserContext.getDataUser())); task.setOwner(Objects.isNull(InvestUserContext.getDataUser()) ? "" : String.valueOf(InvestUserContext.getDataUser()));


Caricamento…
Annulla
Salva