考核BUG修复

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java

@@ -2,6 +2,7 @@ package com.logpm.supervise.vo.api;
 
 
 import com.logpm.supervise.entity.ClassifyEntity;
+import com.logpm.supervise.vo.PointsVO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,4 +13,6 @@ import java.util.List;
 public class ClassifyApiVO extends ClassifyEntity {
 
 	private List<ClassifyApiVO> children;
+
+	private List<PointsVO> pointsVOS;
 }

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java

@@ -37,6 +37,7 @@ import com.logpm.supervise.vo.ClassifyVO;
 import com.logpm.supervise.vo.IndicatorsVO;
 import com.logpm.supervise.vo.api.ClassifyApiVO;
 import com.logpm.supervise.wrapper.IndicatorsWrapper;
+import com.logpm.supervise.wrapper.PointsWrapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -195,9 +196,17 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		Long pid = 0L;
 		List<ClassifyApiVO> classifyEntities = getClassifyList(pid);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
-			List<ClassifyApiVO> classifyList = getClassifyList(classifyEntity.getId());
-			if (!Objects.isNull(classifyList)){
-				classifyEntity.setChildren(classifyList);
+			if (!classifyEntity.getPId().equals(0L)){
+				List<ClassifyApiVO> classifyList = getClassifyList(classifyEntity.getId());
+				List<PointsEntity> list = pointsService.list(Wrappers.<PointsEntity>query().lambda()
+					.eq(PointsEntity::getClassifyId, classifyEntity.getId())
+				);
+				if (!Objects.isNull(classifyList)){
+					classifyEntity.setChildren(classifyList);
+					if(Func.isNotEmpty(list)){
+						classifyEntity.setPointsVOS(PointsWrapper.build().listVO(list));
+					}
+				}
 			}
 		}
 		return classifyEntities;

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/wrapper/PointsWrapper.java

@@ -0,0 +1,47 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.supervise.wrapper;
+
+import com.logpm.supervise.entity.IndicatorsEntity;
+import com.logpm.supervise.entity.PointsEntity;
+import com.logpm.supervise.vo.IndicatorsVO;
+import com.logpm.supervise.vo.PointsVO;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+
+import java.util.Objects;
+
+/**
+ * 分类指标表 包装类,返回视图层所需的字段
+ *
+ * @author BladeX
+ * @since 2024-01-23
+ */
+public class PointsWrapper extends BaseEntityWrapper<PointsEntity, PointsVO>  {
+
+	public static PointsWrapper build() {
+		return new PointsWrapper();
+ 	}
+
+	@Override
+	public PointsVO entityVO(PointsEntity pointsEntity) {
+		PointsVO pointsVO = Objects.requireNonNull(BeanUtil.copy(pointsEntity, PointsVO.class));
+		return pointsVO;
+	}
+
+
+}