123456

whywhyo

2023-07-14 4e94b05b765acb54053123580c570468d41371e1

123456

 zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java

@@ -48,6 +48,12 @@
    private String idNo;

    /**
     * 证件类型
     */
    @Excel(name="证件类型")
    private String type;

    /**
     * 起始时间
     */
    @JsonFormat(pattern = "yyyy-MM-dd")

 zhang-content/src/main/java/com/ruoyi/domain/ZInfoUser.java

@@ -203,11 +203,16 @@
    private Integer identity;

    /**
     * 配偶信息
     */
    @TableField(exist = false)
    private ZInfoUser spouse;

    /**
     * 子列表
     */
    @TableField(exist = false)
    List<ZInfoUser> childList;

    private List<ZInfoUser> childList;




 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java

@@ -268,6 +268,10 @@
                    .map(people -> {
                        if(depth>1){
                            people.setIdentity(1);
                        //根据配偶id查询配偶的数据，封装好一起返回
                        Long spouseId = people.getSpouseId();
                        ZInfoUser spouse = zInfoUserService.getById(spouseId);
                        people.setSpouse(spouse);
                            people.setChildList(fillChildren(people, allPeopleList, depth-1));
                        }
                        return people;
@@ -275,6 +279,8 @@
        } catch (NullPointerException e) {
            throw new RuntimeException("您在加入成员的时候没有指定该成员的父亲或者母亲");
        }


        return AjaxResult.success(result);

    }
@@ -475,13 +481,18 @@
       // layer = layer + 1;
        System.out.println(depth);
        List<ZInfoUser> collect = allPeopleList.stream().filter(
                one -> one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()
                one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1)
        ).map(
                one -> {
                    if(depth==1)
                        return one;
                    else {
                        one.setIdentity(people.getIdentity()+1);

                        //根据配偶id查询配偶的数据，封装好一起返回
                        Long spouseId = one.getSpouseId();
                        ZInfoUser spouse = zInfoUserService.getById(spouseId);
                        one.setSpouse(spouse);
                        List<ZInfoUser> zinfo = fillChildren(one, allPeopleList, depth - 1);
                        one.setChildList(zinfo);
                        System.out.println(one);