From 252b80a521ff9db4b449fd616962d1354e7c9fcc Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 18 十一月 2024 22:04:41 +0800
Subject: [PATCH] again

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index 40ef5ab..d403fe5 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -26,6 +26,7 @@
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * <p>
@@ -446,16 +447,17 @@
         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.between(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth(),zInfoUser.getBirth());
+//        lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
+//        lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
+//        lqw.between(zInfoUser.getHappenStartTime() != null && zInfoUser.getHappenEndTime() != null, ZInfoUser::getBirth, zInfoUser.getHappenStartTime(),zInfoUser.getHappenEndTime());
         lqw.eq(zInfoUser.getClanId()!=null, ZInfoUser::getClanId,zInfoUser.getClanId());
         List<ZInfoUser> allPeopleList = list(lqw);
-       // System.out.println(allPeopleList);
-        //System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
+//        System.out.println(allPeopleList);
+//        System.out.println("============z=============zzzzzzzzzzzzzzzzzzz");
 
 //        List<ZInfoUser> allPeopleList = list();
         List<ZInfoUser> result = null;
+//        if (depth != null){
         try {
             result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0)))
                     .map(people -> {
@@ -465,6 +467,7 @@
                         }
                         return people;
                     }).collect(Collectors.toList());
+//
         } catch (NullPointerException e) {
             throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
         }
@@ -515,8 +518,8 @@
         userList.clear();
         List<ZInfoUser> treeList = (List<ZInfoUser>) listWithTreeByCondition(100, genealogy).get("data");
         recursionFindUser(treeList);
-      //  System.out.println(userList);
-       // System.out.println("---------------");
+//        System.out.println(userList);
+//        System.out.println("---------------");
         List<Genealogy> allData = userList.stream().map(
                 zInfoUser -> {
                     Genealogy newGenealogy = new Genealogy();
@@ -532,12 +535,9 @@
                         spouseInfo.setSpouseName(zInfoUser.getNickName());
                         newGenealogy.setSpouseName(spouse.getNickName());
                     }
-                    System.out.println(newGenealogy);
                     return newGenealogy;
                 }
         ).collect(Collectors.toList());
-      //  System.out.println(allData);
-     //   System.out.println("999999999988888888888++++++++++++++++++++++");
         List<Genealogy> collect = allData.stream()
                 .distinct()
                 .filter((data)-> data.getIsMyFamily() == 1)
@@ -551,14 +551,14 @@
             }
             resultData.add(collect.get(i));
         }
-     //   System.out.println(resultData);
-      //  System.out.println("999999999988888888888++++++++++++++++++++++");
+//        System.out.println(resultData);
+//        System.out.println("999999999988888888888++++++++++++++++++++++");
 //
 //
         //瀵箁esult鍋氫竴涓潯浠剁瓫閫�
-        Iterator<Genealogy> it = resultData.iterator();
-        while(it.hasNext()){
-            Genealogy data = it.next();
+        Iterator<Genealogy> it = resultData.iterator(); //杩唬鍣� 浠巒ull寮�濮�
+        while(it.hasNext()){ //鍒ゆ柇涓嬩竴涓寚閽堟寚鍚戝厓绱犳槸鍚︿负绌�
+            Genealogy data = it.next(); //璺冲埌涓嬩竴涓厓绱�
 
             if(genealogy.getIdentity()!=null){
                 if(data.getIdentity()!=genealogy.getIdentity()){
@@ -596,9 +596,15 @@
             }
 
             if(genealogy.getBirth()!=null){
-                if(data.getBirth().compareTo(genealogy.getBirth())!=0){
+                if(data.getBirth().compareTo(genealogy.getBirth())!=0){  //姣旇緝
                     it.remove();
                     continue;
+                }
+            }
+            if(genealogy.getHappenEndTime() != null && genealogy.getHappenStartTime() != null ){
+                if (data.getBirth() == null) {it.remove(); continue;}
+                if(data.getBirth().before(genealogy.getHappenStartTime()) || data.getBirth().after(genealogy.getHappenEndTime())){
+                    it.remove();
                 }
             }
         }
@@ -936,6 +942,7 @@
 
         // layer = layer + 1;
        // System.out.println(depth);
+
         List<ZInfoUser> collect = allPeopleList.stream().filter(
                 one ->  Objects.equals(one.getFatherId(), people.getUserId()) ||  Objects.equals(one.getMomId(),people.getUserId())
         ).map(

--
Gitblit v1.9.1