From c62a0fd9f7cf7c5a8d7e9ac1fb935a2a60f230cb Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 21 七月 2021 15:46:05 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 100 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 84 insertions(+), 16 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 5e81276..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
@@ -3,13 +3,22 @@
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.community.PageComCvtBusinessAppletsDTO;
import com.panzhihua.common.model.dtos.community.PageCommunityQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
+import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
+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.*;
+
+import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
/**
* @description: 社区通/调查问卷接口
@@ -21,35 +30,94 @@
@RestController
@RequestMapping("/questnaire")
public class CommunityQuestnaireApi extends BaseController {
+ @Resource
+ private CommunityService communityService;
- @ApiOperation(value = "分页查询调查问卷", response = ComActQuestnaireVO.class)
- @PostMapping("/page")
- public R page(@RequestBody PageCommunityQuestnaireDTO pageCommunityQuestnaireDTO) {
- return null;
+ @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 ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ 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());
}
- @ApiOperation(value = "查看问卷", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "查看问卷", response = UsersAnswerVO.class)
@GetMapping("/view")
- public R viewQuestnaire(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ public R viewQuestnaire(@RequestParam("questId") Long questId) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.view(loginUserInfo.getUserId(), questId);
}
- @ApiOperation(value = "在线统计信息", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "在线统计信息", response = QuestnaireAnswerStatVO.class)
@GetMapping("/stat")
- public R stat(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ public R stat(@RequestParam("questId") Long questId) {
+ return communityService.statistics(questId);
}
- @ApiOperation(value = "在线统计详细", response = ComCvtBusinessVO.class)
- @GetMapping("/stat/details")
- public R statDetails(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
- return null;
+ @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
+ @PostMapping("/stat/details")
+ public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
+ //问卷调查
+ return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
+ }
+
+ @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("用户写问卷调查问卷！");
+ }
+ 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