From 7bc19ee6b21131ec01f00a0379d5c35c03760fd6 Mon Sep 17 00:00:00 2001
From: CeDo <cedoo@qq.com>
Date: 星期三, 14 四月 2021 00:46:15 +0800
Subject: [PATCH] 社区问卷调查 分用户类型查询 列表
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
index 081e912..0743d6a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java
@@ -33,10 +33,29 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询调查问卷", response = ComActQuestnaireVO.class)
- @PostMapping("/page")
- public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ @ApiOperation(value = "分页查询登录用户调查问卷", response = ComActQuestnaireVO.class)
+ @PostMapping("/pageUser")
+ public R pageUser(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Integer isPartymember = loginUserInfo.getIsPartymember();
+ Integer isVolunteer = loginUserInfo.getIsVolunteer();
+
+ pageQuestnaireDTO.setForParty(1 == isPartymember);
+ pageQuestnaireDTO.setForVolunteer(1 == isVolunteer);
+ return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
+ }
+
+
+ @ApiOperation(value = "分页查询社区调查问卷", response = ComActQuestnaireVO.class)
+ @PostMapping("/pageVolunteer")
+ public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if(loginUserInfo.getIsVolunteer()!=1){
+ return R.fail("用户不是社区志愿者!");
+ }
+ pageQuestnaireDTO.setForMasses(true);
+ pageQuestnaireDTO.setForVolunteer(true);
+ pageQuestnaireDTO.setForParty(true);
return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
@@ -77,7 +96,7 @@
@ApiOperation(value = "编辑问卷")
@PostMapping("/edit")
- public R eidtQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
return communityService.editQuestnaire(questnaireVO);
}
--
Gitblit v1.7.1