From d93b232662d6d90f858996769a7d89ff0b4cf88c Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 一月 2025 16:48:08 +0800
Subject: [PATCH] 重新提交修改了个人记事本bug
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 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 d403fe5..35f8603 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
@@ -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,8 +23,6 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
/**
* <p>
* 鏈嶅姟瀹炵幇绫�
@@ -52,6 +47,10 @@
@Resource
private ZfRoleService zfRoleService;
+
+ @Resource
+ private ZfClanService zfClanService;
+
@Override
public AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize) {
@@ -101,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);
}
@@ -171,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;
@@ -182,6 +184,7 @@
LambdaQueryWrapper<ZInfoUser> lambdaQueryWrapper = buildCondition(zInfoUser);
List<ZInfoUser> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}", list);
+
return list;
}
@@ -449,15 +452,14 @@
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.getHappenStartTime() != null && zInfoUser.getHappenEndTime() != null, ZInfoUser::getBirth, zInfoUser.getHappenStartTime(),zInfoUser.getHappenEndTime());
+// 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);
-// 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 -> {
@@ -467,7 +469,6 @@
}
return people;
}).collect(Collectors.toList());
-//
} catch (NullPointerException e) {
throw new RuntimeException("鎮ㄥ湪鍔犲叆鎴愬憳鐨勬椂鍊欐病鏈夋寚瀹氳鎴愬憳鐨勭埗浜叉垨鑰呮瘝浜�");
}
@@ -518,8 +519,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();
@@ -535,9 +536,12 @@
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 +555,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(); //杩唬鍣� 浠巒ull寮�濮�
- while(it.hasNext()){ //鍒ゆ柇涓嬩竴涓寚閽堟寚鍚戝厓绱犳槸鍚︿负绌�
- Genealogy data = it.next(); //璺冲埌涓嬩竴涓厓绱�
+ Iterator<Genealogy> it = resultData.iterator();
+ while(it.hasNext()){
+ Genealogy data = it.next();
if(genealogy.getIdentity()!=null){
if(data.getIdentity()!=genealogy.getIdentity()){
@@ -596,16 +600,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();
+ }
}
- }
- 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();
- }
+ else it.remove();
}
}
@@ -789,6 +789,8 @@
}
+
+
private void recursionFindUser(List<ZInfoUser> treeList) {
if (treeList == null || treeList.isEmpty()) {
return;
@@ -942,7 +944,6 @@
// 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