diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index e86731a33..3b2bdf5d6 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -2,6 +2,7 @@ package com.logpm.supervise.vo; import com.logpm.supervise.entity.IndicatorsAnnexEntity; import com.logpm.supervise.entity.IndicatorsEntity; +import com.logpm.supervise.entity.PointsEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -29,6 +30,9 @@ public class IndicatorsVO extends IndicatorsEntity { private String examineDeptName; + + private List PointsVOS = new ArrayList<>(); + private List pictures = new ArrayList<>(); private List files = new ArrayList<>(); 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 b6dc5bb13..ebf78a429 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 @@ -375,6 +375,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl pointsEntities = pointsService.list(Wrappers.query().lambda() + .eq(PointsEntity::getClassifyId, byId.getId()) + ); + if (Func.isNotEmpty(pointsEntities)) { + assert pointsEntities != null; + indicatorsVO.setPointsVOS(PointsWrapper.build().listVO(pointsEntities)); + } ClassifyEntity penantClassifyEntity = this.getOne(Wrappers.query().lambda().eq(ClassifyEntity::getId, byId.getPId())); if (Func.isNotEmpty(penantClassifyEntity)){ indicatorsVO.setParentClassifyId(penantClassifyEntity.getId());