From b4b4067f86a9b7ba91fa92ff6f04b4ed914cb18d Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 13:27:04 +0800
Subject: [PATCH] 问卷调查增加浏览量接口

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java |   49 ++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 40 insertions(+), 9 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 14fa1be..5ac5d5b 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
@@ -4,10 +4,7 @@
 import com.panzhihua.common.model.dtos.community.ExportSpecialUserDTO;
 import com.panzhihua.common.model.dtos.community.ExportUserDTO;
 import com.panzhihua.common.model.dtos.community.NoticeReadDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberAddDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberEditStatusDTO;
-import com.panzhihua.common.model.dtos.grid.EventGridMemberPassResetDTO;
-import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.dtos.user.*;
 import com.panzhihua.common.model.vos.*;
 import com.panzhihua.common.model.vos.shop.ShopStoreVO;
@@ -114,6 +111,15 @@
     R listActivityManager(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
 
     /**
+     * 微心愿搜索社区团队人员列表
+     * @param param 请求参数
+     * @param communityId   社区id
+     * @return  社区团队人员列表
+     */
+    @PostMapping("listactivitymanager2")
+    R listActivityManager2(@RequestParam("param") String param, @RequestParam("communityId")Long communityId);
+
+    /**
      *分页查询人脸识别
      * @param loginUserInfoVO 查询参数
      * @return 分页集合
@@ -131,11 +137,11 @@
 
     /**
      *分页查询人口管理
-     * @param loginUserInfoVO 查询参数
+     * @param userInfoVO 查询参数
      * @return 分页数据
      */
     @PostMapping("pageuser")
-    R pageUser(@RequestBody LoginUserInfoVO loginUserInfoVO);
+    R pageUser(@RequestBody AppletUserInfoVO userInfoVO);
 
     /**
      * 查询所有人员标签
@@ -328,7 +334,7 @@
      * @return 协议集合
      */
     @PostMapping("listagreement")
-    R listAgreement();
+    R listAgreement(@RequestParam("communityId")Long communityId);
 
     /**
      * 编辑用户协议
@@ -623,7 +629,7 @@
      * @param id
      * @return
      */
-    @DeleteMapping("common/data/special/delete")
+    @DeleteMapping("common/data/special/delete1")
     R deleteSpecialInputUser(@RequestParam(value = "id") Long id);
 
     /**
@@ -735,7 +741,7 @@
      * @return  修改结果
      */
     @PostMapping("editGridUser")
-    R editGridUser(@RequestBody EventGridMemberAddDTO eventGridMemberAddDTO);
+    R editGridUser(@RequestBody EventGridMemberEditAdminDTO eventGridMemberAddDTO);
 
     /**
      * 重置网格员密码
@@ -760,4 +766,29 @@
      */
     @PostMapping("gridMemberEditStatus")
     R gridMemberEditStatus(@RequestBody EventGridMemberEditStatusDTO gridMemberEditDTO);
+
+    @GetMapping("big/no/tip")
+    R noTips(@RequestParam("userId") Long userId);
+
+    /**
+     * 查询社区的收益说明
+     * @param communityId   社区id
+     * @return  收益说明
+     */
+    @PostMapping("listagreements")
+    R listAgreements(@RequestParam("communityId")Long communityId);
+
+    @PostMapping("user/getUserGrids")
+    R getGridIsOk(@RequestParam("userId")Long userId);
+
+    @GetMapping("getGridsMemberList")
+    R getGridsMemberList(@RequestParam("communityId")Long communityId);
+
+    /**
+     * 根据用户id查询用户openid
+     * @param userId    用户id
+     * @return  openid
+     */
+    @GetMapping("getUserOpenId")
+    R getUserOpenId(@RequestParam("userId")Long userId);
 }

--
Gitblit v1.7.1