From 5e877672f949b10287f265cc14b4085719d091c3 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 四月 2024 21:05:05 +0800
Subject: [PATCH] 提交会议统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 a473bbe..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
@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.zhang;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,6 +28,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.websocket.server.PathParam;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.regex.Pattern;
@@ -114,6 +116,12 @@
Long userId = user.getUserId();
return AjaxResult.success(zInfoUserService.getInfoById(userId));
}
+ @GetMapping("/{id}")
+ public AjaxResult getInfoById(@PathVariable("id") Long id) {
+ // SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = id;
+ return AjaxResult.success(zInfoUserService.getInfoById(userId));
+ }
//
/**
@@ -198,7 +206,14 @@
public AjaxResult listAllPeopleWithTree(@PathParam("depth") Integer depth){
return zInfoUserService.listWithTree(depth);
}
-
+ /**
+ * 鏍规嵁瀹跺涵鎴愬憳鎵惧埌鎵�鏈変汉
+ */
+ @GetMapping("/allFamInfo")
+ public AjaxResult listAllFamilyPeople()
+ {
+ return zInfoUserService.listAllFamilyPeople();
+ }
/**
* 鎵惧埌鎵�鏈夌殑鎴愬憳
@@ -245,6 +260,21 @@
util.exportExcel(response,list,"瀹惰氨璁板綍鏁版嵁");
}
+ /**
+ * 瀹惰氨2.0
+ */
+ @GetMapping("/list/genealogy2")
+ public AjaxResult listGenealogy2(Genealogy genealogy){
+ Integer pageNum = Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1);
+ Integer pageSize = Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10);
+ return zInfoUserService.listGenealogy2(genealogy,pageNum,pageSize);
+ }
+
+ @GetMapping("/list/getInfoByfid/{fid}")
+ public AjaxResult getInfoByfid(@PathVariable("fid") Long fid)
+ {
+ return zInfoUserService.getInfoByfid(fid);
+ }
}
--
Gitblit v1.9.1