From 900e07dd44ad4ea8f73a98975b839f7408739cdd Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 15 九月 2023 15:22:55 +0800
Subject: [PATCH] 修改ip为localhost
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 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 863c175..8da6d16 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
@@ -326,16 +326,15 @@
*/
public AjaxResult listWithTreeByCondition(Integer depth, Genealogy genealogy) {
-// ZInfoUser zInfoUser = new ZInfoUser();
-// BeanUtils.copyProperties(genealogy, zInfoUser);
-// LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
-// lqw.eq(zInfoUser.getIdentity() != null, ZInfoUser::getIdentity, zInfoUser.getIdentity());
-// lqw.eq(zInfoUser.getSex() != null, ZInfoUser::getSex, zInfoUser.getSex());
-// lqw.like(StringUtils.isNotEmpty(zInfoUser.getNickName()), ZInfoUser::getNickName, zInfoUser.getNickName());
-// lqw.eq(zInfoUser.getBirth() != null, ZInfoUser::getBirth, zInfoUser.getBirth());
+ 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());
-// List<ZInfoUser> allPeopleList = list(lqw);
- List<ZInfoUser> allPeopleList = list();
+ List<ZInfoUser> allPeopleList = list(lqw);
+// List<ZInfoUser> allPeopleList = list();
List<ZInfoUser> result = null;
try {
result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0))
@@ -374,6 +373,9 @@
// )
+// if(genealogy.getIdentity()!=null){
+// result = result.stream().filter(data -> data.getIdentity() == genealogy.getIdentity()).collect(Collectors.toList());
+// }
return AjaxResult.success(result);
@@ -399,13 +401,23 @@
if (zInfoUser.getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ newGenealogy.setSpouse(spouseInfo);
+ spouseInfo.setIdentity(newGenealogy.getIdentity());
+ spouseInfo.setSpouseName(zInfoUser.getNickName());
newGenealogy.setSpouseName(spouse.getNickName());
}
return newGenealogy;
}
).collect(Collectors.toList());
- List<Genealogy> collect = allData.stream().distinct().sorted(Comparator.comparing(Genealogy::getIdentity)).collect(Collectors.toList());
+ List<Genealogy> collect = allData.stream()
+ .distinct()
+ .filter((data)-> data.getIsMyFamily() == 1)
+ .sorted(Comparator.comparing(Genealogy::getIdentity))
+ .collect(Collectors.toList());
List<Genealogy> resultData = new ArrayList<>();
for (int i = (pageNum - 1) * pageSize; i < pageNum * pageSize + pageSize; i++) {
@@ -424,24 +436,42 @@
if(genealogy.getIdentity()!=null){
if(data.getIdentity()!=genealogy.getIdentity()){
it.remove();
+ continue;
}
}
if(genealogy.getNickName()!=null){
if(!data.getNickName().contains(genealogy.getNickName())){
it.remove();
+ continue;
}
}
if(genealogy.getSex()!=null){
if(data.getSex()!=genealogy.getSex()){
it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getPhoneNumber()!=null){
+ if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
+ it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getUnit()!=null){
+ if(data.getUnit()!=genealogy.getUnit()){
+ it.remove();
+ continue;
}
}
if(genealogy.getBirth()!=null){
- if(data.getBirth()!=genealogy.getBirth()){
+ if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
+ continue;
}
}
}
@@ -496,6 +526,11 @@
BeanUtils.copyProperties(zInfoUser, genealogy);
if (zInfoUser.getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUser.getSpouseId());
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ spouseInfo.setIdentity(genealogy.getIdentity());
+ spouseInfo.setSpouseName(zInfoUser.getNickName());
+ genealogy.setSpouse(spouseInfo);
genealogy.setSpouseName(spouse.getNickName());
}
result.add(genealogy);
@@ -521,7 +556,13 @@
genealogy.setIdentity(params.get(i).getIdentity());
if (zInfoUsers.get(i).getSpouseId() != null) {
ZInfoUser spouse = getById(zInfoUsers.get(i).getSpouseId());
+ Genealogy spouseInfo = new Genealogy();
+ BeanUtils.copyProperties(spouse,spouseInfo);
+ spouseInfo.setIdentity(genealogy.getIdentity());
genealogy.setSpouseName(spouse.getNickName());
+ spouseInfo.setSpouseName(zInfoUsers.get(i).getNickName());
+ genealogy.setSpouse(spouseInfo);
+
}
result.add(genealogy);
--
Gitblit v1.9.1