添加我的家族列表

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.List;
 import java.util.Arrays;
 
+import com.ruoyi.app.domain.vo.AppFamilyVo;
 import com.ruoyi.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -52,9 +53,18 @@ public class TbFamilyController extends BaseController {
     {
         startPage();
         LambdaQueryWrapper<TbFamily> lqw = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(tbFamily.getCode())){
+            lqw.eq(TbFamily::getCode ,tbFamily.getCode());
+        }
         if (StringUtils.isNotBlank(tbFamily.getName())){
             lqw.like(TbFamily::getName ,tbFamily.getName());
         }
+        if (StringUtils.isNotBlank(tbFamily.getFullName())){
+            lqw.like(TbFamily::getFullName ,tbFamily.getFullName());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getHometown())){
+            lqw.eq(TbFamily::getHometown ,tbFamily.getHometown());
+        }
         if (StringUtils.isNotBlank(tbFamily.getAddress())){
             lqw.eq(TbFamily::getAddress ,tbFamily.getAddress());
         }
@@ -71,6 +81,19 @@ public class TbFamilyController extends BaseController {
         return getDataTable(list);
     }
 
+
+    /**
+     * 根据会员id查询家族列表
+     */
+    @ApiOperation("根据会员id查询家族列表")
+    @PreAuthorize("@ss.hasPermi('system:family:list')")
+    @GetMapping("/listByUid")
+    public TableDataInfo listByUid(AppFamilyVo familyVo) {
+        startPage();
+        List<TbFamily> list = iTbFamilyService.selectByUserId(familyVo.getUserId());
+        return getDataTable(list);
+    }
+
     /**
      * 导出家族列表
      */

ruoyi-system/src/main/java/com/ruoyi/app/domain/TbFamily.java

@@ -1,6 +1,7 @@
 package com.ruoyi.app.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
@@ -29,32 +30,51 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @TableName("tb_family")
 public class TbFamily extends BaseEntity {
 
-    private static final long serialVersionUID=1L;
-
-
-    /** ID */
+    /** 主键 */
+    @ApiModelProperty(value="主键")
     @TableId(value = "id")
     private Long id;
 
-    /** 家族名称 */
-    @Excel(name = "家族名称")
+    /** 家族ID */
+    @ApiModelProperty(value="家族ID")
+    @Excel(name = "家族ID")
+    private String code;
+
+    /** 姓氏 */
+    @ApiModelProperty(value="姓氏")
+    @Excel(name = "姓氏")
     private String name;
 
+    /** 家族全称 */
+    @ApiModelProperty(value="家族全称")
+    @Excel(name = "家族全称")
+    private String fullName;
+
+    /** 祖籍 */
+    @ApiModelProperty(value="祖籍")
+    @Excel(name = "祖籍")
+    private String hometown;
+
+    /** 所在城市 */
+    @ApiModelProperty(value="所在城市")
+    @Excel(name = "所在城市")
+    private String city;
+
     /** 家族地址 */
+    @ApiModelProperty(value="家族地址")
     @Excel(name = "家族地址")
     private String address;
 
     /** 家族描述 */
+    @ApiModelProperty(value="家族描述")
     @Excel(name = "家族描述")
     private String contents;
 
     /** 家族头像url */
+    @ApiModelProperty(value="家族头像url")
     @Excel(name = "家族头像url")
     private String avatar;
 
-    /** $column.columnComment */
-    @Excel(name = "家族头像url")
-    private String city;
 //
 //    /** 创建者 */
 //    private Long createBy;

ruoyi-system/src/main/java/com/ruoyi/app/domain/vo/AppFamilyVo.java

@@ -0,0 +1,54 @@
+package com.ruoyi.app.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppFamilyVo extends BaseEntity {
+
+    @ApiModelProperty(value="家族id")
+    private Long familyId;
+    @ApiModelProperty(value="中间表id")
+    private Long middleId;
+    @ApiModelProperty(value="成员id")
+    private Long memberId;
+    @ApiModelProperty(value="会员id")
+    private Long userId;
+
+    /** 家族ID */
+    @ApiModelProperty(value="家族ID")
+    private String code;
+
+    /** 姓氏 */
+    @ApiModelProperty(value="姓氏")
+    private String name;
+
+    /** 家族全称 */
+    @ApiModelProperty(value="家族全称")
+    private String fullName;
+
+    /** 祖籍 */
+    @ApiModelProperty(value="祖籍")
+    private String hometown;
+
+    /** 所在城市 */
+    @ApiModelProperty(value="所在城市")
+    private String city;
+
+    /** 家族地址 */
+    @ApiModelProperty(value="家族地址")
+    private String address;
+
+    /** 家族描述 */
+    @ApiModelProperty(value="家族描述")
+    private String contents;
+
+    /** 家族头像url */
+    @ApiModelProperty(value="家族头像url")
+    private String avatar;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/app/mapper/TbFamilyMapper.java

@@ -2,6 +2,9 @@ package com.ruoyi.app.mapper;
 
 import com.ruoyi.app.domain.TbFamily;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 家族Mapper接口
@@ -11,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface TbFamilyMapper extends BaseMapper<TbFamily> {
 
+    List<TbFamily> selectByUserId(@Param("userId") Long uid);
 }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyService.java

@@ -3,6 +3,8 @@ package com.ruoyi.app.service;
 import com.ruoyi.app.domain.TbFamily;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * 家族Service接口
  *
@@ -11,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITbFamilyService extends IService<TbFamily> {
 
+    List<TbFamily> selectByUserId(Long uid);
 }

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

@@ -1,11 +1,15 @@
 package com.ruoyi.app.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.app.mapper.TbFamilyMapper;
 import com.ruoyi.app.domain.TbFamily;
 import com.ruoyi.app.service.ITbFamilyService;
 
+import java.util.List;
+
 /**
  * 家族Service业务层处理
  *
@@ -15,4 +19,13 @@ import com.ruoyi.app.service.ITbFamilyService;
 @Service
 public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> implements ITbFamilyService {
 
+    /**
+     * 根据会员id获取家族列表
+     * @param uid
+     * @return
+     */
+    @Override
+    public List<TbFamily> selectByUserId(Long uid) {
+        return baseMapper.selectByUserId(uid);
+    }
 }

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

@@ -64,7 +64,6 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
 
     @Override
     public TableDataInfo pageList(TbMyPublish tbMyPublish) {
-        startPage();
         LambdaQueryWrapper<TbMyPublish> lqw = new LambdaQueryWrapper<TbMyPublish>();
         if (tbMyPublish.getAppUserId() != null){
             lqw.eq(TbMyPublish::getAppUserId ,tbMyPublish.getAppUserId());
@@ -78,6 +77,7 @@ public class TbMyPublishServiceImpl extends ServiceImpl<TbMyPublishMapper, TbMyP
         if (StringUtils.isNotBlank(tbMyPublish.getDeleted())){
             lqw.eq(TbMyPublish::getDeleted ,tbMyPublish.getDeleted());
         }
+        startPage();
         List<TbMyPublish> list = baseMapper.pageList(lqw);
         return getDataTable(list);
     }

ruoyi-system/src/main/resources/mapper/app/TbFamilyMapper.xml

@@ -2,15 +2,18 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.TbFamilyMapper">
-    
+<mapper namespace="com.ruoyi.app.mapper.TbFamilyMapper">
+
     <resultMap type="TbFamily" id="TbFamilyResult">
         <result property="id"    column="id"    />
+        <result property="code"    column="code"    />
         <result property="name"    column="name"    />
+        <result property="fullName"    column="full_name"    />
+        <result property="hometown"    column="hometown"    />
+        <result property="city"    column="city"    />
         <result property="address"    column="address"    />
         <result property="contents"    column="contents"    />
         <result property="avatar"    column="avatar"    />
-        <result property="city"    column="city"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -18,5 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
     </resultMap>
 
+    <select id="selectByUserId" resultType="com.ruoyi.app.domain.vo.AppFamilyVo">
+        select f.id family_id,mi.id middle_id,m.id member_id,
+        f.name family_name,f.address,f.contents,f.avatar,f.city,f.code,f.full_name,f.hometown,
+        f.create_by,f.create_time,f.update_by,f.update_time,f.remark
+        from tb_family f
+        left join tb_member_middle mi on f.id = mi.family_id
+        left join tb_family_member m on m.id = mi.member_id
+        where m.app_user_id = #{userId}
+    </select>
 
 </mapper>