From c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 12 四月 2021 16:07:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 1f0efca..e6af825 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1638,7 +1638,7 @@
     R getPopulationLists(@RequestBody List<Long> Ids);
 
     /**
-     * 新增社区问卷
+     * 创建调查问卷
      *
      * @param questnaireVO
      * @return
@@ -1653,7 +1653,7 @@
      * @return
      */
     @PostMapping("/questnaire/pagequestnaire")
-    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
 
 
     /**
@@ -1683,4 +1683,57 @@
      */
     @PostMapping("/questnaire/deletequestnaire")
     R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);
+
+    /**
+     * 问卷答题结果
+     *
+     * @param questId 问卷ID
+     */
+    @PostMapping("/questnaire/answerslist")
+    R answerResultList(@RequestParam("questId") Long questId);
+
+
+    /**
+     * 问卷调查详细
+     * @param questId 问卷ID
+     * @return 用户问卷调查详细
+     */
+    @GetMapping("/questnaire/view")
+    R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+    /**
+     * 用户问卷调查详细
+     * @param userId 用户ID
+     * @param questId 问卷ID
+     * @return 用户问卷调查详细
+     */
+    @GetMapping("/questnaire/usersanswer")
+    R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+    /**
+     * 查看用户问卷调查统计信息
+     * @param questId 问卷ID
+     * @return 用户问卷调查统计信息
+     */
+    @GetMapping("/questnaire/stat")
+    R statistics(@RequestParam("questId") Long questId);
+
+
+    /**
+     * 问卷题目 答卷信息
+     *
+     * @param pageQuestnaireSubDetailsDTO 问卷ID
+     */
+    @PostMapping("/questnaire/qaqeustanswerdetails")
+    R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+
+    /**
+     * 社区问卷分页
+     * @param pageQuestnaireAnswerDTO 社区问卷分页参数
+     * @return 分页数据
+     */
+    @PostMapping("/questnaire/pagequestnaireanswer")
+    R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
 }

--
Gitblit v1.7.1