From 12cbe6b75a2cd522dbff3e68df7b2f6f6b86bedf Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 29 四月 2021 16:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 0008140..78939ac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -167,6 +167,15 @@
@PostMapping("putuserisvolunteer")
R putUserIsVolunteer(@RequestParam("phone") String phone,@RequestParam("type")int type);
+
+ /**
+ * 修改用户志愿者状态
+ * @param userId 用户ID
+ * @param type 1 支援者 0不是志愿者
+ */
+ @PostMapping("putuserisvolunteerbyid")
+ R putUserIsVolunteerById(@RequestParam("userId") Long userId,@RequestParam("type")int type);
+
/**
* 用户绑定社区、小区
* @param loginUserInfoVO 社区小区数据
@@ -205,7 +214,9 @@
* @return 成员集合
*/
@PostMapping("listfamily")
- R listFamily(@RequestParam("userId")Long userId);
+ R listFamily(@RequestParam("userId")Long userId,
+ @RequestParam(value = "pageNum") Long pageNum,
+ @RequestParam("pageNum") Long pageSize);
/**
* 新增家庭成员
@@ -613,7 +624,7 @@
* @return
*/
@PostMapping("common/data/special/tags/page")
- R specialInputUserTags(@RequestBody ComMngUserTagDTO comMngUserTagDTO);
+ R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO);
/**
* 新增或修改特殊群体标签
@@ -669,4 +680,20 @@
*/
@PostMapping("editUserTips")
R editUserTips(@RequestBody SysUserEditTipsDTO userEditTipsDTO);
+
+ /**
+ * 获取用户电子档案
+ * @param userId 家庭成员信息
+ * @return 结果
+ */
+ @GetMapping("getUserArchives")
+ R getUserArchives(@RequestParam("userId") Long userId);
+
+ /**
+ * 编辑用户电子档案
+ * @param userArchivesVO 编辑的信息
+ * @return 编辑结果
+ */
+ @PostMapping("updateUserArchives")
+ R updateUserArchives(@RequestBody UpdateUserArchivesVO userArchivesVO);
}
--
Gitblit v1.7.1