From dd5c31de38452bfbaf3d5ff55babc7ff9a1620d5 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 16:45:39 +0800
Subject: [PATCH] Add:yong
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 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..42966b9 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,25 @@
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.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.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 +33,49 @@
@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;
+ public R page(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.pageQuestnaire(pageQuestnaireDTO, loginUserInfo.getCommunityId());
}
@ApiOperation(value = "创建调查问卷")
@PostMapping("/add")
- public R add(@RequestBody ComActQuestnaireVO comActQuestnaireVO) {
- return null;
+ public R add(@RequestBody QuestnaireVO questnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ 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)
+ @ApiOperation(value = "在线统计详细", response = ComActQuestnaireAnswerContentVO.class)
@GetMapping("/stat/details")
- public R statDetails(@RequestBody PageComCvtBusinessAppletsDTO comCvtBusinessAppletsDTO) {
- return null;
+ public R statDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
+ //问卷调查
+ return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
+ }
+
+ @ApiOperation(value = "居民填写问卷调查问卷")
+ @PostMapping("/stat/answer")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
+
}
}
--
Gitblit v1.7.1