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 children; private List 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 selectClassifyList(String deptId) { Long pid = 0L; - List classifyEntities = getClassifyList(pid,null); + List listId = new ArrayList<>(); + List classifyEntities = getClassifyList(pid,null); for (ClassifyApiVO classifyEntity : classifyEntities) { if (classifyEntity.getPId().equals(0L)) { List classifyList = new ArrayList<>(); @@ -240,13 +241,25 @@ public class ClassifyServiceImpl extends BaseServiceImpl 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 indicatorsEntityList = iIndicatorsService.list(Wrappers.query().lambda() + .eq(IndicatorsEntity::getAssessDept, l) + .eq(IndicatorsEntity::getClassifyId, entity.getId()) + ); + if (Func.isNotEmpty(indicatorsEntityList) && indicatorsEntityList.size()>1){ + classifyApiVO.setIsCommit(1); + } + } List list = pointsService.list(Wrappers.query().lambda() .eq(PointsEntity::getClassifyId, entity.getId()) ); @@ -256,10 +269,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl collect = classifyEntities.stream().filter(f -> Func.isNotEmpty(f.getChildren())).collect(Collectors.toList()); + return collect; } @Override