|
@@ -202,7 +202,7 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
albumYelpInfoVoParent.setCreatePhoto((String) userService.querySexAndPhoto(albumYelpParent.getCreateBy()).get("photo"));
|
|
|
albumYelpInfoVoParent.setContent(albumYelpParent.getContent());
|
|
|
albumYelpInfoVoParent.setCreateTime(albumYelpParent.getCreateTime());
|
|
|
- albumYelpInfoVo.setAlbumYelpInfoVo(albumYelpInfoVoParent);
|
|
|
+ albumYelpInfoVo.setYelp(albumYelpInfoVoParent);
|
|
|
}
|
|
|
//专辑信息
|
|
|
AlbumInfoDetailVo albumInfoDetailVo = new AlbumInfoDetailVo();
|
|
@@ -238,7 +238,7 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
eq(AlbumYelp::getAlbumId, pkId).
|
|
|
eq(AlbumYelp::getState, 1));
|
|
|
albumInfoDetailVo.setYelpTotal(countYelp);
|
|
|
- albumYelpInfoVo.setAlbumInfoDetailVo(albumInfoDetailVo);
|
|
|
+ albumYelpInfoVo.setAblum(albumInfoDetailVo);
|
|
|
//审核流程
|
|
|
QueryWrapper<AlbumYelpApprove> queryWrapperApprove = new QueryWrapper<>();
|
|
|
queryWrapperApprove.eq("YELP_ID", pkId);
|
|
@@ -268,4 +268,26 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
albumYelpInfoVo.setFlows(albumApproveVoList);
|
|
|
return albumYelpInfoVo;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 根据知识专辑ID获取点评信息列表
|
|
|
+ * @param albumId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public List<AlbumYelpListPcVo> listAll(String albumId) {
|
|
|
+ String userId = userService.queryLoginUser();
|
|
|
+ List<AlbumYelp> albumYelpList = albumYelpMapper.findListAllYelpInfo(albumId,userId);
|
|
|
+ List<AlbumYelpListPcVo> albumYelpListPcVoList = albumYelpList.parallelStream().map(albumYelp -> {
|
|
|
+ AlbumYelpListPcVo albumYelpListPcVo = new AlbumYelpListPcVo();
|
|
|
+ BeanUtils.copyProperties(albumYelp, albumYelpListPcVo);
|
|
|
+
|
|
|
+ return albumYelpListPcVo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ return albumYelpListPcVoList;
|
|
|
+ }
|
|
|
+
|
|
|
+ private List<AlbumYelpListPcVo> replies(AlbumYelp albumYelp){
|
|
|
+
|
|
|
+ return null;
|
|
|
+ }
|
|
|
}
|