From 50427ad421c9e77a7788c605fbcc50fb0020c4e7 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 30 一月 2024 11:39:37 +0800
Subject: [PATCH] 增加内容
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 20 ++++++++++++++++++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 5 +++++
zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java | 2 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 21 ++++++++++++++++++++-
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 7 +++++++
7 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index ca39bd6..2d590f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.ZInfoUser;
@@ -167,6 +169,7 @@
user.setCreateBy(getUsername());
user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
//鍐欏叆鍒� 鏂板缓绔嬬殑淇℃伅琛ㄩ噷闈�
+
ZfFamily zfFamily = zfFamilyService.getByFamId(userAll.getFamilyId());
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
@@ -183,14 +186,30 @@
infoUser.setIsMyFamily(userAll.getIsMyFamily());
if(userAll.getSpouseId()==0)
infoUser.setSpouseId(null);
- else
+ else {
infoUser.setSpouseId(userAll.getSpouseId());
+
+ }
//鍓嶇淇濊瘉浜嗚鑹蹭笉涓虹┖
if(user.getRoleIds()[0]==102)
infoUser.setRoleId(3L);
// infoUser.setRoleName(user.g);
if(userAll.getFamilyId()!=-1) {
zInfoUserService.saveOrUpdate(infoUser);
+ LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());
+ List<ZInfoUser> lis = zInfoUserService.list(lqw);
+ if(lis.size()>0) {
+// ZInfoUser zi = new ZInfoUser();
+// zi.setUserId(userAll.getSpouseId());
+// // UpdateWrapper wrapper = new UpdateWrapper();
+// zi.setSpouseId(lis.get(0).getUserId());
+// System.out.println(userAll.getSpouseId());
+// System.out.println(lis.get(0).getUserId());
+ zInfoUserService.lambdaUpdate().eq(ZInfoUser::getUserId, userAll.getSpouseId())
+ .set(ZInfoUser::getSpouseId, lis.get(0).getUserId())
+ .update();
+ }
}
return toAjax(userService.insertUser(user));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 88c310d..bca0651 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -270,6 +270,11 @@
return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
}
+ @GetMapping("/list/getInfoByfid/{fid}")
+ public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
+ {
+ return zInfoUserService.getInfoByfid(fid);
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
index 3b12569..1da60dc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPropertyController.java
@@ -47,7 +47,7 @@
@GetMapping("/type")
public AjaxResult listType(){
- return zfPropertyService.listType();
+ return zfPropertyService.selectType();
}
/**
diff --git a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
index 9106639..e5a6790 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/IZfPropertyService.java
@@ -22,6 +22,8 @@
AjaxResult selectDataList(ZfProperty zfProperty,Integer pageNum,Integer pageSize);
List<ZfProperty> selectByIds(Long[] ids);
+ AjaxResult selectType();
+
List<ZfProperty> selectByFamilyIds(Long[] familyIds);
AjaxResult addData(ZfProperty zfProperty);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 4612fa9..bf377fd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -22,6 +22,7 @@
AjaxResult selectInfoList(ZInfoUser zInfoUser, Integer pageNum, Integer pageSize);
+ AjaxResult getInfoByfid(Long fid);
List<ZInfoUser> selectByCondition(ZInfoUser zInfoUser);
AjaxResult removeByUserName(List userName);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 1c33943..dcb41ca 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -307,6 +308,12 @@
}
@Override
+ public AjaxResult selectType() {
+ List<String> lis = list(new QueryWrapper<ZfProperty>().select("distinct (type)").lambda()).stream().map(ZfProperty::getType).collect(Collectors.toList());
+ return AjaxResult.success(lis);
+ }
+
+ @Override
public List<ZfProperty> selectByFamilyIds(Long[] familyIds) {
LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
lqw.in(ZfProperty::getFamilyId,familyIds);
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 64af105..1997d0c 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
@@ -70,6 +70,17 @@
}
+ @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<>();
@@ -366,7 +377,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);
@@ -714,7 +725,12 @@
@Override
public AjaxResult listAllFamilyPeople() {
- List<ZInfoUser> collect = list().stream().filter(zInfoUser -> zInfoUser.getRoleId()== 3).collect(Collectors.toList());
+// 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);
}
--
Gitblit v1.9.1