From d91118dc2906fcc2d47cc2f6562ea664623711b6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 21 Feb 2024 16:49:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E8=AF=A6=E6=83=85=E5=88=86?=
 =?UTF-8?q?=E6=95=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/logpm/supervise/vo/IndicatorsVO.java | 4 ++++
 .../logpm/supervise/service/impl/ClassifyServiceImpl.java  | 7 +++++++
 2 files changed, 11 insertions(+)

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<PointsVO> PointsVOS = new ArrayList<>();
+
 	private List<IndicatorsAnnexEntity> pictures = new ArrayList<>();
 
 	private List<IndicatorsAnnexEntity> 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<ClassifyMapper, Classif
 			if (Func.isNotEmpty(byId)){
 				indicatorsVO.setClassifyId(byId.getId());
 				indicatorsVO.setClassifyName(byId.getName());
+				List<PointsEntity> pointsEntities = pointsService.list(Wrappers.<PointsEntity>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.<ClassifyEntity>query().lambda().eq(ClassifyEntity::getId, byId.getPId()));
 				if (Func.isNotEmpty(penantClassifyEntity)){
 					indicatorsVO.setParentClassifyId(penantClassifyEntity.getId());