From 9df624951f892af5b57ed56df0c15d6266437fb4 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Wed, 28 Sep 2022 14:09:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9-=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=88=E8=AF=84=E8=AE=BA?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=EF=BC=8C=E9=99=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=E3=80=81=E9=97=AE=E9=A2=98=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=95=B0=E7=BB=84=E3=80=82=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/ProblemKnowledgeBaseEO.java        | 12 ++++++
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 41 +++++++++++++++++--
 2 files changed, 50 insertions(+), 3 deletions(-)

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<String> problemTypeNameList;
+
+    /**附件展示名称数组*/
+    @TableField(exist = false)
+    private List<String> 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<ProblemKnowle
 			LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 
 			StringBuffer problemTypeSb = new StringBuffer();
+			StringBuffer accessoryFileSb = new StringBuffer();
 			for (ProblemKnowledgeBaseEO data : datas) {
 				problemTypeSb.append(data.getProblemType() + ",");
+				accessoryFileSb.append(data.getAccessoryFile() + ",");
 			}
 
 			List<String> probleKnowledgeBaseIdList = datas.stream().map(ProblemKnowledgeBaseEO::getId).distinct().collect(Collectors.toList());
@@ -570,6 +572,14 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 			List<ProblemKnowledgeBaseUserEO> permissionUserEOList = this.problemKnowledgeBaseUserEOService.list(permissionUserQueryWrapper);
 			this.problemKnowledgeBaseUserEOService.disposeData(permissionUserEOList,cut);
 
+			//查询出数据的所有的评论数量
+			QueryWrapper<ProblemKnowledgeBaseCommentEO> commentQueryWrapper = new QueryWrapper<>();
+			commentQueryWrapper.lambda().in(ProblemKnowledgeBaseCommentEO::getProblemKnowledgeBaseId,probleKnowledgeBaseIdList);
+			List<ProblemKnowledgeBaseCommentEO> commentEOList = this.problemKnowledgeBaseCommentEOService.list(commentQueryWrapper);
+
+			//根据文件的ids查询文件信息
+			List<OSSFile> accessoryFileList = this.iOSSFileService.getFileInfos(accessoryFileSb.toString());
+
 			List<ProblemKnowledgeBaseClassifyEO> problemKnowledgeBaseClassifyEOList = new ArrayList<>();
 			if(StringUtils.isNotEmpty(problemTypeSb.toString())){
 				List<String> 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<ProblemKnowle
 					data.setPermissionUserList(permissionUserEOS);
 				}
 
+				long commentCount = commentEOList.stream().filter(commentEO -> {
+					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<String> 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<ProblemKnowle
 							}
 						}
 						return flag;
-					}).map(ProblemKnowledgeBaseClassifyEO::getProblemLabel).collect(Collectors.joining(","));
+					}).map(ProblemKnowledgeBaseClassifyEO::getProblemLabel).collect(Collectors.toList());
 
-					data.setProblemTypeName(problemTypeName);
+					data.setProblemTypeName(problemTypeNameList.stream().collect(Collectors.joining(",")));
+					data.setProblemTypeNameList(problemTypeNameList);
 				}
 
 				String targetMarket = data.getTargetMarket();
@@ -697,6 +717,21 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 
 					data.setTargetMarket_dicText(targetMarket_dicText);
 				}
+				String accessoryFile = data.getAccessoryFile();
+				if(StringUtils.isNotEmpty(accessoryFile)){
+					String[] accessoryFileArr = accessoryFile.split(",");
+					List<String> 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);
+				}
 			});
 		}
 	}