From c1a4da8002e5ab5de15671f2d87ad95e0f22d3bf Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 13 四月 2021 19:28:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityQuestnaireApi.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 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 9dcc8ae..081e912 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,9 +10,8 @@
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.*;
+
import com.panzhihua.common.service.community.CommunityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -68,4 +67,32 @@
return communityService.qaQeustAnswerDetails(pageQuestnaireSubDetailsDTO);
}
+ @ApiOperation(value = "居民填写问卷调查问卷")
+ @PostMapping("/stat/answer")
+ public R usersAnswerQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.usersAnsweQuestnaire(usersAnswerQuestnaireVO, loginUserInfo.getUserId());
+
+ }
+
+ @ApiOperation(value = "编辑问卷")
+ @PostMapping("/edit")
+ public R eidtQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ return communityService.editQuestnaire(questnaireVO);
+ }
+
+ @ApiOperation(value = "继续调研/停止调研")
+ @GetMapping("/toggle")
+ public R toggle(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ return communityService.editQuestnaireDO(editComActQuestnaireVo);
+ }
+
+ @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