From a438efdb271973368246cac3b761d7263623f55e Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 14 五月 2021 10:31:39 +0800
Subject: [PATCH] Merge branch 'test'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 36 +++++++++++++++++++++---------------
1 files changed, 21 insertions(+), 15 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 0743d6a..cff8961 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,36 +33,36 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询登录用户调查问卷", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "分页查询登录用户调查问卷", response = QuestnaireListVo.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);
+ pageQuestnaireDTO.setForParty(1 == isPartymember.intValue());
+ pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
-
- @ApiOperation(value = "分页查询社区调查问卷", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
@PostMapping("/pageVolunteer")
public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- if(loginUserInfo.getIsVolunteer()!=1){
- return R.fail("用户不是社区志愿者!");
- }
- pageQuestnaireDTO.setForMasses(true);
+ pageQuestnaireDTO.setForMasses(null);
pageQuestnaireDTO.setForVolunteer(true);
pageQuestnaireDTO.setForParty(true);
- return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
+ return communityService.pageQuestnaire(pageQuestnaireDTO, getLoginUserInfo().getCommunityId());
}
@ApiOperation(value = "创建调查问卷")
@PostMapping("/add")
public R add(@RequestBody QuestnaireVO questnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ boolean userHasRight = loginUserInfo.getIsmemberrole()==1;
+ //if(!userHasRight){
+ if(false){
+ return R.fail("用户无创建调查问卷的权限！");
+ }
return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
}
@@ -80,7 +80,7 @@
}
@ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
- @GetMapping("/stat/details")
+ @PostMapping("/stat/details")
public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
//问卷调查
return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
@@ -90,6 +90,11 @@
@PostMapping("/stat/answer")
public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ boolean userHasRight = loginUserInfo.getIsmemberrole()==1;
+ //if(!userHasRight){
+ if(false){
+ return R.fail("用户写问卷调查问卷！");
+ }
return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
}
@@ -102,9 +107,10 @@
}
@ApiOperation(value = "继续调研/停止调研")
- @GetMapping("/toggle")
+ @PostMapping("/toggle")
public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
- return communityService.editQuestnaireDO(editComActQuestnaireVo);
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaireDO(editComActQuestnaireVo, loginUserInfo.getUserId());
}
@ApiOperation(value = "删除问卷")
--
Gitblit v1.7.1