Преглед на файлове

家族-成员表添加第几代字段

Alex преди 4 години
родител
ревизия
99ecb27619

+ 4 - 1
ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -78,7 +78,10 @@ public class FamilyMemberController extends AppBaseController {
     @ApiOperation("家族树 列表")
     @GetMapping("/treeList")
     public AjaxResult treeList(Long familyId) {
-        return null;
+        AppMemberVo memberVo = new AppMemberVo();
+        memberVo.setFamilyId(familyId);
+        List<AppMemberVo> list = memberService.selectFamilyTree(memberVo);
+        return AjaxResult.success(list);
     }
 
     @ApiOperation("添加/修改成员-家族树")

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/app/domain/TbMemberMiddle.java

@@ -77,6 +77,11 @@ public class TbMemberMiddle implements Serializable {
     @Excel(name = "是否族长 Y是  N否")
     private String patriarch;
 
+    /** 第几代 */
+    @ApiModelProperty(value="第几代")
+    @Excel(name = "第几代")
+    private Integer generation;
+
     @ApiModelProperty(value="姓名")
     @TableField(exist = false)
     private String name;