From f34203dacf5485b06d9d80618e5e14cf4463c2d7 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 10 六月 2024 10:12:06 +0800 Subject: [PATCH] 修改了增加,修改用户代码 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 148 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 129 insertions(+), 19 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..e7f008e 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 @@ -14,6 +14,7 @@ import com.ruoyi.common.utils.StringUtils; import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfEvent; +import com.ruoyi.domain.ZfFamily; import com.ruoyi.domain.ZfRelation; import com.ruoyi.domain.dto.*; import com.ruoyi.mapper.ZInfoUserMapper; @@ -69,6 +70,25 @@ } + @Override + public ZInfoUser getInfoBysysId(Long sysid) { + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZInfoUser::getSysId, sysid); + List<ZInfoUser> list = list(lqw); + return list.get(0); + } + + @Override + public AjaxResult getInfoByfid(Long fid) { + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZInfoUser::getFamilyId, fid); + lqw.eq(ZInfoUser::getIsMyFamily, 1L); + lqw.isNull(ZInfoUser::getSpouseId); + List<ZInfoUser> list = list(lqw); + + return AjaxResult.success(list); + } + private LambdaQueryWrapper<ZInfoUser> buildCondition(ZInfoUser zInfoUser) { LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); @@ -100,6 +120,27 @@ log.info("杩斿洖鐨勬暟鎹负:{}", list); return list; + } + + @Override + public AjaxResult removeByUserName(List userName) { + LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>(); + lqw.in(ZInfoUser::getNickName, userName); + List<Long> ids = list(lqw).stream().map(ZInfoUser::getUserId).collect(Collectors.toList()); + removeByIds(ids); + return AjaxResult.success("鍒犻櫎鎴愬姛"); + } + + @Override + public List<ZInfoUser> selectByFamId(long fid) { + LambdaQueryWrapper<ZfFamily> lqw = new LambdaQueryWrapper<>(); + lqw.eq(ZfFamily::getId, fid); + ZfFamily zfFamily = zfFamilyService.list(lqw).get(0); + LambdaQueryWrapper<ZInfoUser> lqws = new LambdaQueryWrapper<>(); + lqws.eq(ZInfoUser::getFatherId, zfFamily.getFid()); + // lqws.eq(ZInfoUser::getMomId, zfFamily.getMid()); + List<ZInfoUser> list = list(lqws); + return list; } @Override @@ -299,22 +340,29 @@ List<ZInfoUser> myFamilyPeopleList = allPeopleList.stream().filter(people -> people.getUserId() != 1 && people.getIsMyFamily() == 1).collect(Collectors.toList()); - - result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0) && people.getIsMyFamily() == 1) +result = allPeopleList.stream().filter(people -> people!=null && people.getUserId() != 1 && ((people.getFatherId()!=null &&people.getFatherId() == 0 )|| (people.getMomId()!=null&&people.getMomId() == 0)) && people.getIsMyFamily() == 1) .map(people -> { +// System.out.println("======================================="); +// System.out.println(people); if (depth > 1) { - people.setIdentity(1); - //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� - Long spouseId = people.getSpouseId(); - ZInfoUser spouse = zInfoUserService.getById(spouseId); - spouse.setIdentity(1); - people.setSpouse(spouse); - people.setChildList(fillChildren(people, myFamilyPeopleList, depth - 1)); + if(people!=null) { + people.setIdentity(1); + //鏍规嵁閰嶅伓id鏌ヨ閰嶅伓鐨勬暟鎹紝灏佽濂戒竴璧疯繑鍥� + Long spouseId = people.getSpouseId(); + if (spouseId != null) { + ZInfoUser spouse = zInfoUserService.getById(spouseId); + spouse.setIdentity(1); + people.setSpouse(spouse); + } + people.setChildList(fillChildren(people, myFamilyPeopleList, depth - 1)); + } } +// System.out.println("+++++++++++++++++++++++++++++"); +// System.out.println(people); return people; }).collect(Collectors.toList()); - +//System.out.println("--------------++++++++++++++++--------------"); return AjaxResult.success(result); } @@ -337,7 +385,7 @@ // List<ZInfoUser> allPeopleList = list(); List<ZInfoUser> result = null; try { - result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && (people.getFatherId() == 0 || people.getMomId() == 0)) + result = allPeopleList.stream().filter(people -> people.getUserId() != 1 && ((people.getFatherId()!=null&&people.getFatherId() == 0) || (people.getMomId()!=null&&people.getMomId() == 0))) .map(people -> { if (depth > 1) { people.setIdentity(1); @@ -401,13 +449,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 +497,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 +574,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 +604,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); @@ -540,12 +623,25 @@ @Override public ZInfoUser getInfoById(Long userId) { - ZInfoUser user = getById(userId); - Long familyId = user.getFamilyId(); - String familyName = zfFamilyService.getById(familyId).getName(); - String roleName = zfRoleService.getById(user.getRoleId()).getName(); - user.setFamilyName(familyName); - user.setRoleName(roleName); + ZInfoUser user = getInfoBysysId(userId); + + + if(user!=null) + { + Long familyId = user.getFamilyId(); + // System.out.println("dddddddddddddddddddd"); + + String roleName = zfRoleService.getById(user.getRoleId()).getName(); + + user.setRoleName(roleName); + System.out.println("dddddddddddddddddddd"); + System.out.println(familyId); + if(familyId!=-1) + { + String familyName = zfFamilyService.getById(familyId).getName(); + user.setFamilyName(familyName); + } + } return user; } @@ -636,6 +732,17 @@ } @Override + public AjaxResult listAllFamilyPeople() { +// List<ZInfoUser> lis = list(); +// for(ZInfoUser tm: lis) +// { +// System.out.println(tm.getRoleId()); +// } + List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser!=null&&zInfoUser.getRoleId()!=null&&zInfoUser.getRoleId()== 3).collect(Collectors.toList()); + return AjaxResult.success(collect); + } + + @Override public AjaxResult listMySelfAndSpouse(Long id) { LambdaQueryWrapper<ZInfoUser> lqw1 = new LambdaQueryWrapper<>(); lqw1.eq(ZInfoUser::getUserId, id); @@ -674,7 +781,7 @@ // ).collect(Collectors.toList()); List<ZInfoUser> collect = allPeopleList.stream().filter( - one -> (one.getFatherId() == people.getUserId() || one.getMomId() == people.getUserId()) && (people.getIsMyFamily() == 1) + one -> ((one.getFamilyId()!=null && one.getFatherId() == people.getUserId()) || (one.getMomId()!=null&&one.getMomId() == people.getUserId())) && (people.getIsMyFamily() == 1) ).map( one -> { if (depth == 1) { @@ -694,6 +801,9 @@ Long spouseId = one.getSpouseId(); if (spouseId != null) { ZInfoUser spouse = zInfoUserService.getById(spouseId); + // System.out.println(spouseId); + // System.out.println(spouse); + // System.out.println("0000))))))))))))))))"); spouse.setIdentity(people.getIdentity() + 1); one.setSpouse(spouse); } -- Gitblit v1.9.1