From 15c27fbc95568b15dfcfe33a7e7235867c329695 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 21 Feb 2024 14:58:06 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E8=80=83=E6=A0=B8=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/supervise/vo/api/ClassifyApiVO.java |  2 ++
 .../com/logpm/supervise/api/ClassifyApi.java  |  1 -
 .../service/impl/ClassifyServiceImpl.java     | 24 +++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java
index d5d47ee65..c3c01b9cb 100644
--- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java
+++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/ClassifyApiVO.java
@@ -15,4 +15,6 @@ public class ClassifyApiVO extends ClassifyEntity {
 	private List<ClassifyApiVO> children;
 
 	private List<PointsVO> pointsVOS;
+
+	private Integer isCommit;
 }
diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
index dfcf8a659..cd051804f 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java
@@ -100,5 +100,4 @@ public class ClassifyApi {
 		R r = classifyService.deptList();
 		return r;
 	}
-
 }
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 06bfea8c0..731749abb 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
@@ -231,7 +231,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 	@Override
 	public List<ClassifyApiVO> selectClassifyList(String deptId) {
 		Long pid = 0L;
-		List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
+		List<Long> listId = new ArrayList<>();
+			List<ClassifyApiVO> classifyEntities = getClassifyList(pid,null);
 		for (ClassifyApiVO classifyEntity : classifyEntities) {
 			if (classifyEntity.getPId().equals(0L)) {
 				List<ClassifyApiVO> classifyList = new ArrayList<>();
@@ -240,13 +241,25 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 					.ne(ClassifyEntity::getPId, 0L);
 				if (Func.isNotBlank(deptId)){
 					ne.in(ClassifyEntity::getExamineDeptId,  Func.toLongList(deptId));
-
+					//查询是否已经提交过考核
+					listId = Func.toLongList(deptId);
 				}
 				List<ClassifyEntity> entityList = this.list(ne
 				);
 				for (ClassifyEntity entity : entityList) {
 					ClassifyVO classifyVO = ClassifyWrapper.build().entityVO(entity);
 					ClassifyApiVO classifyApiVO = Func.copy(classifyVO, ClassifyApiVO.class);
+					classifyApiVO.setIsCommit(0);
+					if (Func.isNotEmpty(listId)){
+						Long l = listId.get(listId.size());
+						List<IndicatorsEntity> indicatorsEntityList = iIndicatorsService.list(Wrappers.<IndicatorsEntity>query().lambda()
+							.eq(IndicatorsEntity::getAssessDept, l)
+							.eq(IndicatorsEntity::getClassifyId, entity.getId())
+						);
+						if (Func.isNotEmpty(indicatorsEntityList) && indicatorsEntityList.size()>1){
+							classifyApiVO.setIsCommit(1);
+						}
+					}
 					List<PointsEntity> list = pointsService.list(Wrappers.<PointsEntity>query().lambda()
 						.eq(PointsEntity::getClassifyId, entity.getId())
 					);
@@ -256,10 +269,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 					}
 					classifyList.add(classifyApiVO);
 				}
-				classifyEntity.setChildren(classifyList);
+				if (Func.isNotEmpty(classifyList)){
+					classifyEntity.setChildren(classifyList);
+				}
 			}
 		}
-		return classifyEntities;
+		List<ClassifyApiVO> collect = classifyEntities.stream().filter(f -> Func.isNotEmpty(f.getChildren())).collect(Collectors.toList());
+		return collect;
 	}
 
 	@Override