修改家谱中会显示超出范围的数据&家族模块的导出

zqy

2025-04-15 3ee06bd46c3809fdd00e509debd97dcd039ed031

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

@@ -13,10 +13,7 @@
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.*;
import com.ruoyi.mapper.ZInfoUserMapper;
import com.ruoyi.service.ZInfoUserService;
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRelationService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +23,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
 *  服务实现类
@@ -51,6 +47,10 @@

    @Resource
    private ZfRoleService zfRoleService;

    @Resource
    private ZfClanService zfClanService;


    @Override
    public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -100,22 +100,25 @@
//    }

    @Override
    public AjaxResult findInfoUserNameAClan(String nickName)
    public AjaxResult findUserNameAClan(List<String> nickNames)
    {
        List<ZfShareOther> shareOtherClans = new ArrayList<>();
        for (String nickName:nickNames) {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setNickName(nickName);

        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        List<ZInfoUser> zInfoUsers = list(lqw);
        List<ShareOtherClan> shareOtherClans = new ArrayList<>();


        for (ZInfoUser zInfoUser1: zInfoUsers) {
            ShareOtherClan shareOtherClan = new ShareOtherClan();
            shareOtherClan.setNickName(zInfoUser1.getNickName());
            ZfShareOther shareOtherClan = new ZfShareOther();
            shareOtherClan.setUserName(zInfoUser1.getNickName());
            shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
            shareOtherClan.setClanId(zInfoUser1.getClanId());
            shareOtherClan.setClanName(zfClanService.getById(zInfoUser1.getClanId()).getClanName());
            shareOtherClans.add(shareOtherClan);
        }
        }}
        return AjaxResult.success(shareOtherClans);
    }

@@ -170,7 +173,7 @@
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getUnit()), ZInfoUser::getUnit, zInfoUser.getUnit());
        lqw.like(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(zInfoUser.getMaritalStatus() != null, ZInfoUser::getMaritalStatus, zInfoUser.getMaritalStatus());
        lqw.like(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        lqw.le(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
        lqw.like(zInfoUser.getClanId() != null, ZInfoUser::getClanId, zInfoUser.getClanId());
        return lqw;

@@ -181,6 +184,7 @@
        LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
        List<ZInfoUser> list = list(lambdaQueryWrapper);
        log.info("返回的数据为:{}", list);

        return list;

    }
@@ -446,8 +450,8 @@
        ZInfoUser zInfoUser = new ZInfoUser();
        BeanUtils.copyProperties(genealogy, zInfoUser);
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
//        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
//        lqw.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
        lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
        List<ZInfoUser> allPeopleList = list(lqw);
@@ -515,8 +519,7 @@
        userList.clear();
        List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
        recursionFindUser(treeList);
      //  System.out.println(userList);
       // System.out.println("---------------");

        List<Genealogy> allData = userList.stream().map(
                zInfoUser -> {
                    Genealogy newGenealogy = new Genealogy();
@@ -536,8 +539,6 @@
                    return newGenealogy;
                }
        ).collect(Collectors.toList());
      //  System.out.println(allData);
     //   System.out.println("999999999988888888888++++++++++++++++++++++");
        List<Genealogy> collect = allData.stream()
                .distinct()
                .filter((data)-> data.getIsMyFamily() == 1)
@@ -545,7 +546,7 @@
                .collect(Collectors.toList());
        List<Genealogy> resultData = new ArrayList<>();

        for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
        for (int i = pageNum ; i < pageSize + pageNum; i++) {
            if (i >= collect.size()) {
                break;
            }
@@ -596,10 +597,12 @@
            }

            if(genealogy.getBirth()!=null){
                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
                    it.remove();
                    continue;
                if(data.getBirth()!=null) {
                    if (data.getBirth().compareTo(genealogy.getBirth()) != 0) {
                        it.remove();
                    }
                }
                else it.remove();
            }
        }

@@ -638,7 +641,7 @@

        HashMap<String, Object> resultMap = new HashMap<>();
        resultMap.put("data", resultData);
        resultMap.put("total", resultData.size());
        resultMap.put("total", collect.size());
        resultMap.put("pageNum", pageNum);
        resultMap.put("pageSize", pageSize);

@@ -705,14 +708,15 @@
    public ZInfoUser getInfoById(Long userId) {
        ZInfoUser user = getInfoBysysId(userId);


        if(user==null) {
            //利用userId查询
            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
            lqw.eq(ZInfoUser::getUserId, userId);
            List<ZInfoUser> list = list(lqw);

            user = list.get(0);
            if(list.size()>0)
                user = list.get(0);
            else
                return null;

        }

@@ -781,6 +785,8 @@
    }




    private void recursionFindUser(List<ZInfoUser> treeList) {
        if (treeList == null || treeList.isEmpty()) {
            return;