From 7f220c9aa253204183c42edaa98d9f78e9eb6685 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 23 五月 2023 16:09:26 +0800
Subject: [PATCH] 456

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java |   34 +++++++++++++++++++++++++++++-----
 1 files changed, 29 insertions(+), 5 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 86671ae..2f8e4c9 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,8 @@
 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.service.ZInfoUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -186,8 +188,8 @@
      * 瀹舵牴缃�
      */
     @GetMapping("/root")
-    public AjaxResult listAllPeopleWithTree(){
-        return zInfoUserService.listWithTree();
+    public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
+        return zInfoUserService.listWithTree(depth);
     }
 
 
@@ -208,11 +210,33 @@
         return zInfoUserService.addParent(fatherId,motherId);
     }
 
+    /**
+     * 鏍规嵁鏈汉id鏌ヨ鏈汉淇℃伅浠ュ強閰嶅伓淇℃伅
+     */
+    @GetMapping("/listMyself/{id}")
+    public AjaxResult listMySelfAndSpouse(@PathVariable("id") Long id){
+        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