diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java index 68b565715..8bfe5793f 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.java @@ -30,4 +30,6 @@ public interface ClassifyMapper extends BaseMapper { List selectAllClassifyList(@Param("pid") Long pid,@Param("list")List list); List exportList(@Param("param") ClassifyDTO classifyDTO); + + List findAll(); } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml index 7a55b6322..87352026f 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/ClassifyMapper.xml @@ -111,6 +111,10 @@ order by create_time desc + diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 8752d2a22..88483b939 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -119,6 +119,10 @@ public class ClassifyServiceImpl extends BaseServiceImpl all = baseMapper.findAll(); + IPage pages = baseMapper.pageList(page, classifyDTO); List records = pages.getRecords(); @@ -143,22 +147,27 @@ public class ClassifyServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("classify_id", classifyId) - .eq("is_deleted", 0); - List list = pointsService.list(queryWrapper); - String pointStr = ""; - for (PointsEntity pointsEntity : list) { - if(StringUtil.isBlank(pointStr)){ - pointStr = pointStr + pointsEntity.getPoint(); - }else{ - pointStr = pointStr + "," + pointsEntity.getPoint(); + + ClassifyEntity classifyEntity =all.stream().filter(item -> item.getId().equals(pId1)).findFirst().orElse(null); + + if(classifyEntity!=null){ + record.setParentClassifyName(classifyEntity.getName()); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("classify_id", classifyId) + .eq("is_deleted", 0); + List list = pointsService.list(queryWrapper); + String pointStr = ""; + for (PointsEntity pointsEntity : list) { + if(StringUtil.isBlank(pointStr)){ + pointStr = pointStr + pointsEntity.getPoint(); + }else{ + pointStr = pointStr + "," + pointsEntity.getPoint(); + } } + record.setPointStr(pointStr); + record.setPointsEntities(list); } - record.setPointStr(pointStr); - record.setPointsEntities(list); + } }