From 7358b281de62e37822c2c2eab0ff619aeaacf0ab Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 30 五月 2023 20:55:10 +0800
Subject: [PATCH] 456
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 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 3fdc182..1579775 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
@@ -13,6 +13,9 @@
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfRelation;
import com.ruoyi.domain.dto.EmpowerDto;
+import com.ruoyi.domain.dto.Genealogy;
+import com.ruoyi.domain.dto.GenealogyExportDto;
+import com.ruoyi.domain.dto.RelationDto;
import com.ruoyi.service.ZInfoUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -106,20 +109,21 @@
//
/**
- * 鏂板銆佷慨鏀逛釜浜鸿缁嗕俊鎭褰�
+ * 淇敼涓汉璇︾粏淇℃伅璁板綍
*/
// @PreAuthorize("@ss.hasPermi('system:property:add')")
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody ZInfoUser zInfoUser) {
- if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
- throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
- }
+ @PutMapping
+ public AjaxResult update(@RequestBody ZInfoUser zInfoUser) {
+// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
+// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
+// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
zInfoUser.setUserId(userId);
return toAjax(zInfoUserService.saveOrUpdate(zInfoUser));
}
+
// /**
// * 淇敼涓汉璇︾粏淇℃伅璁板綍
@@ -151,15 +155,12 @@
*/
@GetMapping("/relation")
public AjaxResult listMyRelation() {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
- return zInfoUserService.searchMyRelation(userId);
+ return zInfoUserService.searchMyRelation();
}
@PostMapping("/relation")
public AjaxResult addRelation(@RequestBody ZfRelation zfRelation){
return zInfoUserService.addRelation(zfRelation);
-
}
@PutMapping("/relation")
@@ -216,11 +217,25 @@
return zInfoUserService.listMySelfAndSpouse(id);
}
+ /**
+ * 瀹惰氨
+ */
+ @GetMapping("/list/genealogy")
+ public AjaxResult listGenealogy(Genealogy genealogy){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zInfoUserService.listGenealogy(genealogy,pageNum,pageSize);
+ }
-
-
-
-
+ /**
+ * 瀵煎嚭瀹惰氨
+ */
+ @PostMapping("/export/genealogy")
+ public void exportGenealogy(@RequestBody List<GenealogyExportDto> params, HttpServletResponse response){
+ List<Genealogy> list= zInfoUserService.selectDatas(params);
+ ExcelUtil<Genealogy> util = new ExcelUtil<>(Genealogy.class);
+ util.exportExcel(response,list,"瀹惰氨璁板綍鏁版嵁");
+ }
}
--
Gitblit v1.9.1