From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 91 +++++++++++++--------------------------------
1 files changed, 27 insertions(+), 64 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 a677e86..ab4409e 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
@@ -34,94 +34,57 @@
@Resource
private CommunityService communityService;
- @ApiOperation(value = "分页查询登录用户调查问卷", response = QuestnaireListVo.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.intValue());
- pageQuestnaireDTO.setForVolunteer(1 == isVolunteer.intValue());
- pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
- return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
- }
-
- @ApiOperation(value = "分页查询社区调查问卷", response = QuestnaireListVo.class)
- @PostMapping("/pageVolunteer")
- public R pageVolunteer(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
- pageQuestnaireDTO.setForMasses(null);
- pageQuestnaireDTO.setForVolunteer(true);
- pageQuestnaireDTO.setForParty(true);
- 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("用户无创建调查问卷的权限！");
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
}
- return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
+ pageQuestnaireDTO.setCommunityId(loginUserInfo.getCommunityId());
+ pageQuestnaireDTO.setUserId(loginUserInfo.getUserId());
+ return communityService.pageQuestnaire(pageQuestnaireDTO);
}
- @ApiOperation(value = "查看问卷", response = UsersAnswerVO.class)
- @GetMapping("/view")
+ @ApiOperation(value = "查询调查问卷详情", response = UsersAnswerVO.class)
+ @GetMapping("/detail")
public R viewQuestnaire(@RequestParam("questId") Long questId) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return communityService.view(loginUserInfo.getUserId(), questId);
- }
-
- @ApiOperation(value = "在线统计信息", response = QuestnaireAnswerStatVO.class)
- @GetMapping("/stat")
- public R stat(@RequestParam("questId") Long questId) {
- return communityService.statistics(questId);
- }
-
- @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
- @PostMapping("/stat/details")
- public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
- //问卷调查
- return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
+ if(loginUserInfo == null){
+ return R.fail(401,"请先登录");
+ }
+ return communityService.viewDetail(loginUserInfo.getUserId(), questId);
}
@ApiOperation(value = "居民填写问卷调查问卷")
@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("用户写问卷调查问卷！");
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
}
+ usersAnswerQuestnaireVO.setUserId(loginUserInfo.getUserId());
//填写调查问卷发放积分
communityService.addIntegralTradeAdmin(new AddComActIntegralUserDTO(usersAnswerQuestnaireVO.getQuestId()
,AddComActIntegralUserDTO.integralType.cydcwj,loginUserInfo.getCommunityId(),loginUserInfo.getUserId()));
- return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
}
- @ApiOperation(value = "编辑问卷")
- @PostMapping("/edit")
- public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return communityService.editQuestnaire(questnaireVO);
+ @ApiOperation(value = "添加浏览量")
+ @GetMapping("/add/view")
+ public R addView(@RequestParam("questId") Long questId) {
+ return communityService.addView(questId);
}
- @ApiOperation(value = "继续调研/停止调研")
- @PostMapping("/toggle")
- public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ @ApiOperation(value = "用户弹窗添加不在提醒接口")
+ @GetMapping("/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId) {
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());
+ if(loginUserInfo == null){
+ return R.fail("请先登录");
+ }
+ return communityService.addNoNotice(questId,loginUserInfo.getUserId());
}
}
--
Gitblit v1.7.1