From d29cce61fb3a38f9f57a64a2a20d276b0d1254bc Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期六, 16 九月 2023 11:54:24 +0800
Subject: [PATCH] es的增加索引和查询已经写好了，可以直接调用了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 b4c060e..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
@@ -401,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++) {
@@ -439,6 +449,20 @@
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;
}
@@ -502,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);
@@ -527,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