rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

首页bi链接增加排序字段

This commit is contained in:
10002327 2024-08-14 14:15:59 +08:00
parent d3651cf4dd
commit ea8f277d1c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java
View File

@ -161,7 +161,8 @@ public class MaterialHomeApi extends BaseApi {
@ApiOperation("获取BI地址") @ApiOperation("获取BI地址")
public ResultVO<List<MaterialHomeBiVO>> getBiUrlList(){ public ResultVO<List<MaterialHomeBiVO>> getBiUrlList(){
return ResultVO.success(Optional.ofNullable(materialHomeBiConfig) return ResultVO.success(Optional.ofNullable(materialHomeBiConfig)
.map(MaterialHomeBiConfig::getList).orElse(Lists.newArrayList())); .map(MaterialHomeBiConfig::getList)
.map(ls -> ls.stream().sorted(Comparator.comparing(MaterialHomeBiVO::getSort)).collect(Collectors.toList())).orElse(Lists.newArrayList()));
} }
} }

3
nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java
View File

@ -27,5 +27,8 @@ public class MaterialHomeBiVO {
@ApiModelProperty(value = "链接地址") @ApiModelProperty(value = "链接地址")
private String url; private String url;
@ApiModelProperty(value = "排序字段")
private Integer sort;
} }

4
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomHomeApi.java
View File

@ -2,6 +2,7 @@ package com.nflg.product.bomnew.api.user;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -65,6 +66,7 @@ public class BomHomeApi extends BaseApi {
List<BomNewSapErrorMsgEntity> msgList = sapErrorMsgService.list(Wrappers.<BomNewSapErrorMsgEntity>lambdaQuery() List<BomNewSapErrorMsgEntity> msgList = sapErrorMsgService.list(Wrappers.<BomNewSapErrorMsgEntity>lambdaQuery()
.ge(BomNewSapErrorMsgEntity::getCreatedTime,date90) .ge(BomNewSapErrorMsgEntity::getCreatedTime,date90)
.eq(BomNewSapErrorMsgEntity::getCreatedName,SessionUtil.getRealName()) .eq(BomNewSapErrorMsgEntity::getCreatedName,SessionUtil.getRealName())
.orderByAsc(BomNewSapErrorMsgEntity::getType)
.orderByDesc(BomNewSapErrorMsgEntity::getCreatedTime) .orderByDesc(BomNewSapErrorMsgEntity::getCreatedTime)
.last(String.format("limit %d",limitNums))); .last(String.format("limit %d",limitNums)));
List<BomNewSapErrorMsgVO> reList = Convert.toList(BomNewSapErrorMsgVO.class,msgList); List<BomNewSapErrorMsgVO> reList = Convert.toList(BomNewSapErrorMsgVO.class,msgList);
@ -100,7 +102,7 @@ public class BomHomeApi extends BaseApi {
.get(re.getTargetRowId())).map(BomNewPbomParentEntity::getMaterialDesc).orElse("")); .get(re.getTargetRowId())).map(BomNewPbomParentEntity::getMaterialDesc).orElse(""));
} }
}); });
return ResultVO.success(reList); return ResultVO.success(reList.stream().filter(re-> StrUtil.isNotBlank(re.getMaterialNo())).collect(Collectors.toList()));
} }
} }