修改我的近况详情

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbMyPublishServiceImpl.java

@@ -119,16 +119,36 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
     public TbMyPublish getPublish(Long id) {
         TbMyPublish publish = this.getById(id);
         if (publish != null) {
+            // 图片列表
             List<TbPublishImg> publishImgs = imgService.list(new LambdaQueryWrapper<TbPublishImg>()
                     .in(TbPublishImg::getPublishId, id)
             );
+            // 点赞列表
+            List<TbPublishThumbs> thumbsList = thumbsService.selectList(new LambdaQueryWrapper<TbPublishThumbs>()
+                    .in(TbPublishThumbs::getPublishId, id)
+            );
+            // 评论列表
+            List<TbPublishComment> commentList = commentService.selectList(new LambdaQueryWrapper<TbPublishComment>()
+                    .in(TbPublishComment::getPublishId, id)
+            );
+            //点赞数
             int thumbs = this.getThumbs(id);
+            //评论数
             int comments = this.getComments(id);
+            TbAppUser userPublish = userService.getById(publish.getAppUserId());
+            if (userPublish != null) {
+                publish.setNickName(userPublish.getNickName());
+                publish.setAvatar(userPublish.getAvatar());
+            }
+            // 如果是留念人发表
             if (publish.getMessageUserId() != null) {
                 TbAppUser user = userService.getById(publish.getMessageUserId());
                 publish.setMessageUser(user.getNickName());
+                publish.setMessageUserAvatar(user.getAvatar());
             }
             publish.setImgList(publishImgs);
+            publish.setCommentList(commentList);
+            publish.setThumbsList(thumbsList);
             publish.setThumbs(thumbs);
             publish.setComments(comments);
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/TPersonalModel.java

@@ -40,6 +40,11 @@ public class TPersonalModel implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    /** 类型 1留言语 2留念语 3缅怀语 */
+    @ApiModelProperty(value="类型 1留言语 2留念语 3缅怀语")
+    @Excel(name = "类型 1留言语 2留念语 3缅怀语")
+    private String type;
+
     /** 留念内容 */
     @ApiModelProperty(value="留念内容")
     @Excel(name = "留念内容")

ruoyi-system/src/main/resources/mapper/system/TPersonalModelMapper.xml

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="TPersonalModel" id="TPersonalModelResult">
         <result property="id"    column="id"    />
+        <result property="type"    column="type"    />
         <result property="contents"    column="contents"    />
         <result property="enable"    column="enable"    />
     </resultMap>