Selaa lähdekoodia

我的默认家族查询接口 添加创建者

Alex 4 vuotta sitten
vanhempi
commit
8496c9ed37

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

@@ -1,5 +1,6 @@
 package com.ruoyi.app.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -79,22 +80,8 @@ public class TbFamily extends BaseEntity {
     @Excel(name = "家族头像url")
     private String avatar;
 
-//
-//    /** 创建者 */
-//    private Long createBy;
-//
-//    /** 创建时间 */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private Date createTime;
-//
-//    /** 更新者 */
-//    private Long updateBy;
-//
-//    /** 更新时间 */
-//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-//    private Date updateTime;
-//
-//    /** 备注 */
-//    @Excel(name = "备注")
-//    private String remark;
+    /** 是否族长  Y是  N否 */
+    @ApiModelProperty(value="是否创建者 Y是  N否")
+    @TableField(exist = false)
+    private String patriarchName;
 }

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

@@ -18,6 +18,7 @@ import java.util.List;
 public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
 
     AppMemberVo get(Long memberId);
+    List<AppMemberVo> selectMemberList(LambdaQueryWrapper wrapper);
     AppMemberVo getMemberDetail(Long familyId, Long memberId);
     boolean saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> myMemberList(LambdaQueryWrapper<AppMemberVo> lqw);

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

@@ -158,6 +158,11 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
         return null;
     }
     @Override
+    public List<AppMemberVo> selectMemberList(LambdaQueryWrapper wrapper){
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+        return baseMapper.selectFamilyTree(wrapper);
+    }
+    @Override
     public List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
 

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

@@ -6,6 +6,7 @@ import com.ruoyi.app.domain.TbMemberMiddle;
 import com.ruoyi.app.domain.vo.AppFamilyVo;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
+import com.ruoyi.app.service.ITbFamilyMemberService;
 import com.ruoyi.app.service.ITbMemberMiddleService;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StringUtils;
@@ -36,6 +37,8 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
     private ITbMemberMiddleService middleService;
     @Autowired
     private ITbAppUserService userService;
+    @Autowired
+    private ITbFamilyMemberService memberService;
 
     /**
      * 根据会员id获取家族列表
@@ -138,6 +141,17 @@ public class TbFamilyServiceImpl extends ServiceImpl<TbFamilyMapper, TbFamily> i
                 .eq(TbFamily::getId, middle.getFamilyId())
                 .last("limit 1")
         );
+        // 查出家族族长(创建者、群主)
+        if (family != null) {
+            List<AppMemberVo> memberVos = memberService.selectMemberList(new LambdaQueryWrapper<AppMemberVo>()
+                    .eq(AppMemberVo::getFamilyId,family.getId())
+                    .eq(AppMemberVo::getPatriarch,"Y")
+            );
+            if (memberVos.size() > 0) {
+                AppMemberVo vo = memberVos.get(0);
+                family.setPatriarchName(vo.getName());
+            }
+        }
         return family;
     }