修改家族树管理

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

@@ -59,6 +59,15 @@ public class TbFamilyMemberController extends BaseController {
         return getDataTable(list);
     }
 
+    @ApiOperation("查询家族树 列表")
+    @PreAuthorize("@ss.hasPermi('system:member:list')")
+    @GetMapping("/treeList")
+    public TableDataInfo selectFamilyTree(AppMemberVo memberVo){
+        startPage();
+        List<AppMemberVo> list = iTbFamilyMemberService.selectFamilyTree(memberVo);
+        return getDataTable(list);
+    }
+
     /**
      * 获取家族成员详细信息
      */

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

@@ -94,7 +94,8 @@ public class AppMemberVo extends BaseEntity {
     @ApiModelProperty(value="族员拼音第一个字母")
     private String MemberPyFirst;
 
-
+    @ApiModelProperty(value="父辈")
+    private String father;
 
     /** 配偶 */
     @ApiModelProperty(value="配偶 会员id")

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

@@ -19,4 +19,5 @@ import java.util.List;
 public interface TbFamilyMemberMapper extends BaseMapper<TbFamilyMember> {
 
     List<AppMemberVo> selectFamilyMember(@Param(Constants.WRAPPER) LambdaQueryWrapper<AppMemberVo> wrapper);
+    List<AppMemberVo> selectFamilyTree(@Param(Constants.WRAPPER) LambdaQueryWrapper<AppMemberVo> wrapper);
 }

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

@@ -19,6 +19,7 @@ public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
     AppMemberVo get(Long memberId);
     boolean saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
+    List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);
     TbMemberMiddle getFamilyTree(Long familyId);
     boolean addFamilyTree(TbMemberMiddle member);
     AjaxResult delMember(String familyId, Long[] ids);

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

@@ -128,6 +128,25 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
     }
 
     @Override
+    public List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo) {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+
+        LambdaQueryWrapper<AppMemberVo> lqw = new LambdaQueryWrapper<>();
+        if (memberVo.getFamilyId() == null) {
+            return new ArrayList<>();
+        }
+        lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
+        lqw.isNotNull(AppMemberVo::getParentId);
+        if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
+            lqw.and(
+                    i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
+                            .like(AppMemberVo::getMobile,memberVo.getSearchValue())
+            );
+        }
+        return baseMapper.selectFamilyTree(lqw);
+    }
+
+    @Override
     public List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
 

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

@@ -34,18 +34,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <sql id="sqlAppMember">
-        select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,a.deleted,a.enable,a.login_time,a.login_ip,
-        a.py_code user_py_code,a.py_first user_py_first,
-        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by, a.update_time user_update_time, a.remark user_remark
+    <select id="selectFamilyTree" resultType="com.ruoyi.app.domain.vo.AppMemberVo">
+        select a.id user_id,a.joins,a.template_id,a.nick_name,a.avatar,a.qrcode,a.mobile,a.openid,a.ver_code,
+        a.deleted,a.enable,a.login_time,a.login_ip, a.py_code user_py_code,a.py_first user_py_first,
+        a.create_by user_create_by,a.create_time user_create_time, a.update_by user_update_by,
+        a.update_time user_update_time, a.remark user_remark
         ,
-        b.id member_id,b.spouse_user_id,b.name,b.birthday,b.gender,b.education,b.state,b.py_code member_py_code,b.py_first member_py_first,
+        b.id member_id,b.spouse_user_id,b.name,b.birthday,b.gender,b.education,b.state,
+        b.py_code member_py_code,b.py_first member_py_first,
         (select me.name from tb_family_member me where me.app_user_id = b.spouse_user_id) spouse,
-        b.create_by member_create_by,b.create_time member_create_time,b.update_by member_update_by,b.update_time member_update_time,b.remark member_remark
-        from tb_family_member b
-        left join tb_app_user a on a.id = b.app_user_id
+        b.create_by member_create_by,b.create_time member_create_time,b.update_by member_update_by,
+        b.update_time member_update_time,b.remark member_remark
+        ,
+        mi.family_id,mi.parent_id,mi.admin,mi.acquiesce,mi.status,mi.patriarch,
+        (select mm.name from tb_family_member mm where mm.app_user_id = mi.parent_id) father
+        from tb_app_user a
+        left join  tb_family_member b on a.id = b.app_user_id
         left join tb_member_middle mi on b.id = mi.member_id
         ${ew.customSqlSegment}
-    </sql>
+    </select>
 
 </mapper>