|
|
|
@ -368,6 +368,20 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
|
|
|
|
|
if (Func.isNotEmpty(userR)) { |
|
|
|
|
indicatorsVO.setCreatedUserName(userR.getData().getName()); |
|
|
|
|
} |
|
|
|
|
//处理指标项
|
|
|
|
|
if (Func.isNotEmpty(indicatorsVO)){ |
|
|
|
|
Long classifyId = indicatorsVO.getClassifyId(); |
|
|
|
|
ClassifyEntity byId = this.getById(classifyId); |
|
|
|
|
if (Func.isNotEmpty(byId)){ |
|
|
|
|
indicatorsVO.setClassifyId(byId.getId()); |
|
|
|
|
indicatorsVO.setClassifyName(byId.getName()); |
|
|
|
|
ClassifyEntity penantClassifyEntity = this.getOne(Wrappers.<ClassifyEntity>query().lambda().eq(ClassifyEntity::getId, byId.getPId())); |
|
|
|
|
if (Func.isNotEmpty(penantClassifyEntity)){ |
|
|
|
|
indicatorsVO.setParentClassifyId(penantClassifyEntity.getId()); |
|
|
|
|
indicatorsVO.setParentClassifyName(penantClassifyEntity.getName()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (Func.isNotEmpty(list)) { |
|
|
|
|
Map<Integer, List<IndicatorsAnnexEntity>> resourceMap = list.stream().filter(item -> !Objects.isNull(item.getType())).collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType)); |
|
|
|
|
if (Func.isNotEmpty(resourceMap.get(1))) { |
|
|
|
|