diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java index 7d63858bf..95e57c94a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/ProblemKnowledgeBaseEO.java @@ -182,4 +182,16 @@ public class ProblemKnowledgeBaseEO implements Serializable { /**模糊搜索全部输入字段条件*/ @TableField(exist = false) private String searchStr; + + /**评论总数量*/ + @TableField(exist = false) + private long commentCount; + + /**问题分类展示名称数组*/ + @TableField(exist = false) + private List problemTypeNameList; + + /**附件展示名称数组*/ + @TableField(exist = false) + private List accessoryFileNameList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java index 3a7397a15..00d3bdef1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java @@ -544,8 +544,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl probleKnowledgeBaseIdList = datas.stream().map(ProblemKnowledgeBaseEO::getId).distinct().collect(Collectors.toList()); @@ -570,6 +572,14 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl permissionUserEOList = this.problemKnowledgeBaseUserEOService.list(permissionUserQueryWrapper); this.problemKnowledgeBaseUserEOService.disposeData(permissionUserEOList,cut); + //查询出数据的所有的评论数量 + QueryWrapper commentQueryWrapper = new QueryWrapper<>(); + commentQueryWrapper.lambda().in(ProblemKnowledgeBaseCommentEO::getProblemKnowledgeBaseId,probleKnowledgeBaseIdList); + List commentEOList = this.problemKnowledgeBaseCommentEOService.list(commentQueryWrapper); + + //根据文件的ids查询文件信息 + List accessoryFileList = this.iOSSFileService.getFileInfos(accessoryFileSb.toString()); + List problemKnowledgeBaseClassifyEOList = new ArrayList<>(); if(StringUtils.isNotEmpty(problemTypeSb.toString())){ List problemTypeList = Arrays.asList(problemTypeSb.toString().substring(0, problemTypeSb.toString().length() - 1).split(",")).stream().distinct().collect(Collectors.toList()); @@ -653,10 +663,19 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl { + boolean flag = false; + if (StringUtils.equals(data.getId(), commentEO.getProblemKnowledgeBaseId())) { + flag = true; + } + return flag; + }).count(); + data.setCommentCount(commentCount); + String problemType = data.getProblemType(); if(StringUtils.isNotEmpty(problemType)){ String[] problemTypeArr = problemType.split(","); - String problemTypeName = finalProblemKnowledgeBaseClassifyEOList.stream().filter(problemKnowledgeBaseClassifyEO -> { + List problemTypeNameList = finalProblemKnowledgeBaseClassifyEOList.stream().filter(problemKnowledgeBaseClassifyEO -> { boolean flag = false; for (String type : problemTypeArr) { if (StringUtils.equals(type, problemKnowledgeBaseClassifyEO.getId())) { @@ -664,9 +683,10 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl accessoryFiles = accessoryFileList.stream().filter(file -> { + boolean flag = false; + for (String accessory : accessoryFileArr) { + if (StringUtils.equals(file.getId(), accessory)) { + flag = true; + break; + } + } + return flag; + }).map(OSSFile::getFileName).collect(Collectors.toList()); + data.setAccessoryFileNameList(accessoryFiles); + } }); } }