From 7c7c20fb9df0b440e6c4ee1b2e8d655ebaf9192d Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 26 四月 2021 18:13:01 +0800
Subject: [PATCH] bugfixed: 78648
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 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 42966b9..ba18d57 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
@@ -10,10 +10,7 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.ComActQuestnaireVO;
import com.panzhihua.common.model.vos.community.ComCvtBusinessVO;
-import com.panzhihua.common.model.vos.community.questnaire.QuestnaireAnswerStatVO;
-import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
-import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerVO;
-import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.*;
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
@@ -36,10 +33,26 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询调查问卷", response = ComActQuestnaireVO.class)
- @PostMapping("/page")
- public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ @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.intValue());
+ pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+// pageQuestnaireDTO.setState(0);
+ return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
+ }
+
+ @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
+ @PostMapping("/pageVolunteer")
+ public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ pageQuestnaireDTO.setForMasses(null);
+ pageQuestnaireDTO.setForVolunteer(true);
+ pageQuestnaireDTO.setForParty(true);
return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
@@ -47,6 +60,11 @@
@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());
}
@@ -64,7 +82,7 @@
}
@ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
- @GetMapping("/stat/details")
+ @PostMapping("/stat/details")
public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
//问卷调查
return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
@@ -72,10 +90,36 @@
@ApiOperation(value = "居民填写问卷调查问卷")
@PostMapping("/stat/answer")
- public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ 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());
}
+ @ApiOperation(value = "编辑问卷")
+ @PostMapping("/edit")
+ public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaire(questnaireVO);
+ }
+
+ @ApiOperation(value = "继续调研/停止调研")
+ @PostMapping("/toggle")
+ public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaireDO(editComActQuestnaireVo, loginUserInfo.getUserId());
+ }
+
+ @ApiOperation(value = "删除问卷")
+ @GetMapping("/delete")
+ public R delete(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaireDO(questId, loginUserInfo.getUserId());
+ }
+
}
--
Gitblit v1.7.1