From e74987c5c7e6256e84a0852f36a367bf8f2e032d Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 16:21:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 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 38b08ea..61edf48 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
@@ -7,9 +7,14 @@
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;
@@ -45,24 +50,32 @@
return communityService.addQuestnaire(questnaireVO, loginUserInfo.getCommunityId(), loginUserInfo.getUserId());
}
- @ApiOperation(value = "查看问卷", response = ComActQuestnaireVO.class)
+ @ApiOperation(value = "查看问卷", response = UsersAnswerVO.class)
@GetMapping("/view")
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(@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 PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO) {
//问卷调查
return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
}
+ @ApiOperation(value = "居民填写问卷调查问卷")
+ @GetMapping("/stat/answer")
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
+
+ }
+
}
--
Gitblit v1.7.1