--no commit message

app/resource/src/main/java/com/zrqx/resource/fg/controller/recommend/FgRecommendController.java

@@ -103,6 +103,13 @@ public class FgRecommendController {
 			form.setNum(query.getNum());
 			form.setDiyTypeCode(query.getDiyTypeCode());
 			PageInfo<FgEbookListVO> result = ebookService.getRecommendList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -113,6 +120,13 @@ public class FgRecommendController {
 			form.setNum(query.getNum());
 			form.setDiyTypeCode(query.getDiyTypeCode());
 			PageInfo<FgEbookListVO> result = ebookService.getDiyTypeRecommendList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -121,6 +135,13 @@ public class FgRecommendController {
 			FgQueryRecommedResourceForm form = new FgQueryRecommedResourceForm();
 			form.setIds(ids);
 			PageInfo<FgProjectLibraryListVO> result = projectLibraryService.queryRecommendProjectList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -130,6 +151,13 @@ public class FgRecommendController {
 			form.setIds(ids);
 			form.setNum(query.getNum());
 			PageInfo<FgVideoLibraryListVO> result = videoLibraryService.queryRecommendVideoAndAudio(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -147,6 +175,13 @@ public class FgRecommendController {
 			form.setIds(ids);
 			form.setNum(query.getNum());
 			PageInfo<FgVideoLibraryListVO> result = videoLibraryService.queryRecommendVideo(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -156,6 +191,13 @@ public class FgRecommendController {
 			form.setIds(ids);
 			form.setNum(query.getNum());
 			PageInfo<FgAudioLibraryListVO> result = audioLibraryService.queryRecommendAudioList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -166,6 +208,13 @@ public class FgRecommendController {
 			form.setNum(query.getNum());
 			form.setDiyTypeCode(query.getDiyTypeCode());
 			PageInfo<FgEbookListVO> result = ebookService.getDiyTypeRecommendList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}
@@ -176,6 +225,13 @@ public class FgRecommendController {
 			form.setNum(query.getNum());
 			form.setDiyTypeCode(query.getDiyTypeCode());
 			PageInfo<FgEbookListVO> result = ebookService.getRecommendList(form, pageParam);
+			result.getList().forEach(f -> {
+				FgQueryCommentForm queryCommentForm = new FgQueryCommentForm();
+				queryCommentForm.setResourceId(f.getId());
+				queryCommentForm.setResourceType(f.getResourceType());
+				FgCommentNumAndScoreVo commentNumAndScoreVo = commentService.getCommentNumAndScore(queryCommentForm);
+				BeanUtils.copyProperties(commentNumAndScoreVo, f);
+			});
 			vo.setRecommendResourcePage(result);
 			return CallBack.success(vo);
 		}