From ea8f277d1ce1d5a5a05d1a756c10dc5dd3cab732 Mon Sep 17 00:00:00 2001 From: 10002327 Date: Wed, 14 Aug 2024 14:15:59 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5bi=E9=93=BE=E6=8E=A5=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/material/api/user/material/MaterialHomeApi.java | 3 ++- .../com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java | 3 +++ .../java/com/nflg/product/bomnew/api/user/BomHomeApi.java | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java index 1e06b389..1eff1f39 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/api/user/material/MaterialHomeApi.java @@ -161,7 +161,8 @@ public class MaterialHomeApi extends BaseApi { @ApiOperation("获取BI地址") public ResultVO> getBiUrlList(){ 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())); } } \ No newline at end of file diff --git a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java index f29cdd03..47ef5c52 100644 --- a/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java +++ b/nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/vo/MaterialHomeBiVO.java @@ -27,5 +27,8 @@ public class MaterialHomeBiVO { @ApiModelProperty(value = "链接地址") private String url; + @ApiModelProperty(value = "排序字段") + private Integer sort; + } \ No newline at end of file diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomHomeApi.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomHomeApi.java index eda0281f..a227ee59 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomHomeApi.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/api/user/BomHomeApi.java @@ -2,6 +2,7 @@ package com.nflg.product.bomnew.api.user; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Maps; @@ -65,6 +66,7 @@ public class BomHomeApi extends BaseApi { List msgList = sapErrorMsgService.list(Wrappers.lambdaQuery() .ge(BomNewSapErrorMsgEntity::getCreatedTime,date90) .eq(BomNewSapErrorMsgEntity::getCreatedName,SessionUtil.getRealName()) + .orderByAsc(BomNewSapErrorMsgEntity::getType) .orderByDesc(BomNewSapErrorMsgEntity::getCreatedTime) .last(String.format("limit %d",limitNums))); List reList = Convert.toList(BomNewSapErrorMsgVO.class,msgList); @@ -100,7 +102,7 @@ public class BomHomeApi extends BaseApi { .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())); } } \ No newline at end of file