From 3ee06bd46c3809fdd00e509debd97dcd039ed031 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 15 四月 2025 21:00:11 +0800
Subject: [PATCH] 修改家谱中会显示超出范围的数据&家族模块的导出
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 82 +++++++++++++++++++++++++++++++++++++++--
1 files changed, 78 insertions(+), 4 deletions(-)
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 8015c54..e4c1438 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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import com.ruoyi.common.annotation.Log;
@@ -12,6 +13,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
@@ -23,7 +25,9 @@
import com.ruoyi.service.ZfFamilyService;
import com.ruoyi.service.ZfRoleService;
import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -48,9 +52,11 @@
@RestController
@RequestMapping("/self/user")
public class ZInfoUserController extends BaseController {
-
+ @Autowired
+ private ISysUserService userService;
@Resource
private ZInfoUserService zInfoUserService;
+
@Resource
private ZfFamilyService zfFamilyService;
@@ -118,12 +124,25 @@
public AjaxResult getInfo() {
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- return AjaxResult.success(zInfoUserService.getInfoById(userId));
+
+
+
+ ZInfoUser zInfoUser = zInfoUserService.getInfoById(userId);
+ if(zInfoUser!=null)
+ {
+ return AjaxResult.success(zInfoUser);
+ }
+ else
+ return AjaxResult.success(user);
}
@GetMapping("/{id}")
public AjaxResult getInfoById(@PathVariable("id") Long id) {
// SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = id;
+
+
+ //鏌ヨsys_user琛�
+ // SysUser sysUser = sysUserService.selectUserById(userId);
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
//
@@ -140,10 +159,43 @@
// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
- zInfoUser.setUserId(userId);
- return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ zInfoUser.setSysId(userId);
+
+ LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+ uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.update(uw));
+ // saveOrUpdate(zInfoUser));
}
+ @Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
+ @PutMapping("/updateInfo")
+ public AjaxResult updateInfo(@RequestBody ZInfoUser zInfoUser) {
+// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
+// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
+// }
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ zInfoUser.setSysId(userId);
+
+
+
+ user.setSex(zInfoUser.getSex()+"");
+ user.setUserName(zInfoUser.getOldName());
+ user.setPhonenumber(zInfoUser.getPhoneNumber());
+//
+// us.setUserId(user.getSysId());
+// us.setUserName(user.getUserName());
+// us.setNickName(user.getNickName());
+// us.setRoleId(user.getRoleId());
+// us.setSex(user.getSex());
+// us.setStatus(user.getStatus());
+// us.setRemark(user.getRemark());
+ userService.updateUser(user);
+ //LambdaUpdateWrapper<ZInfoUser> uw = new LambdaUpdateWrapper<>();
+ // uw.eq(ZInfoUser::getSysId,userId).set(ZInfoUser::getSelfIntroduction,zInfoUser.getSelfIntroduction());
+ return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
+ // saveOrUpdate(zInfoUser));
+ }
// /**
// * 淇敼涓汉璇︾粏淇℃伅璁板綍
@@ -336,6 +388,13 @@
public AjaxResult listGenealogy(Genealogy genealogy){
Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ System.out.println("11111111//"+userId);
+ Integer clanId=zInfoUserService.getInfoBysysId(userId).getClanId();
+ genealogy.setClanId(clanId);
+ System.out.println("11111111//"+clanId);
+
return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
}
@@ -365,6 +424,21 @@
return zInfoUserService.getInfoByfid(fid);
}
+ /**
+ * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+ */
+ @PostMapping("/byName")
+ public AjaxResult listByUserNameDate(@RequestBody SysUser sysUser)
+ {
+
+ List<SysUser> strings = sysUserMapper.getUserByUserName(sysUser.getUserName());
+ List<String> strings1= new ArrayList<>();
+ for (SysUser s:strings){
+ strings1.add(s.getNickName());
+ }
+
+ return zInfoUserService.findUserNameAClan(strings1);
+ }
}
--
Gitblit v1.9.1