From 4a7fa07cefb891cf3294a33684fe781bc7d1d89b Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 19 八月 2021 09:26:43 +0800
Subject: [PATCH] 调查问卷接口开发

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 7 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 2d66207..ce6aa27 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
@@ -19,6 +19,7 @@
 import com.panzhihua.common.model.dtos.community.integral.admin.EditComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralRuleDTO;
 import com.panzhihua.common.model.dtos.community.integral.admin.PageComActIntegralTradeDTO;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
 import com.panzhihua.common.model.dtos.community.switchs.SearchCommunityDTO;
 import com.panzhihua.common.model.dtos.community.wallet.*;
 import com.panzhihua.common.model.dtos.elders.ComEldersAuthGetResultDTO;
@@ -1883,16 +1884,25 @@
      * @return
      */
     @PostMapping("/questnaire/addquestnaire")
-    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
 
     /**
-     * 社区问卷列表
+     * 小程序-社区问卷列表
      *
-     * @param pageQuestnaireDTO
-     * @return
+     * @param pageQuestnaireDTO 请求参数
+     * @return  社区问卷列表
      */
     @PostMapping("/questnaire/pagequestnaire")
-    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
+    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
+
+    /**
+     * 社区后台-社区问卷列表
+     *
+     * @param pageQuestnaireDTO 请求参数
+     * @return  社区问卷列表
+     */
+    @PostMapping("/questnaire/admin/pagequestnaire")
+    R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO);
 
 
     /**
@@ -1912,7 +1922,7 @@
      * @return
      */
     @PostMapping("/questnaire/editquestnairedo")
-    R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId);
+    R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo);
 
     /**
      * 删除问卷  ——隐藏
@@ -1940,6 +1950,23 @@
      */
     @GetMapping("/questnaire/view")
     R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+    /**
+     * 小程序-问卷调查详情
+     * @param userId    用户id
+     * @param questId   问卷id
+     * @return  问卷调查详情
+     */
+    @GetMapping("/questnaire/view/detail")
+    R viewDetail(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);
+
+    /**
+     * 社区后台-查询问卷调查详情
+     * @param questId   问卷id
+     * @return  问卷调查详情
+     */
+    @GetMapping("/questnaire/admin/detail")
+    R QuesDetail(@RequestParam("questId") Long questId);
 
     /**
      * 用户问卷调查详细
@@ -1986,7 +2013,7 @@
      * @param usersAnswerQuestnaireVO 填写情况
      */
     @PostMapping("/questnaire/usersanswequestnaire")
-    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);
+    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);
 
     /**
      * 店铺列表-分页查询
@@ -4131,6 +4158,9 @@
     @PostMapping("timedTaskActivityNotice")
     R timedTaskActivityNotice();
 
+    @PostMapping("timedTaskQuestionnaire")
+    R timedTaskQuestionnaire();
+
     /**
      * 查询社区所有列表
      * @return  社区列表
@@ -4154,4 +4184,27 @@
     @PostMapping("/switch/community/search/distance/list")
     R communitySwitchSearchDistanceList(@RequestBody SearchCommunityDTO communityDTO);
 
+    /**
+     * 问卷调查统计汇总
+     * @param summaryDTO   请求参数
+     * @return  统计汇总
+     */
+    @PostMapping("/questnaire/statisticsSummary")
+    R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO);
+
+    /**
+     * 问卷调查统计汇总导出数据查询
+     * @param questId   调查问卷id
+     * @return  调查统计汇总导出数据
+     */
+    @GetMapping("/questnaire/statisticsSummary/export")
+    R statisticsSummaryExport(@RequestParam("questId") Long questId);
+
+    /**
+     * 问卷调查统计汇总表头统计
+     * @param questId   调查问卷id
+     * @return  问卷调查统计汇总表头统计数据
+     */
+    @GetMapping("/questnaire/statisticsSummary/header")
+    R statisticsSummaryHeader(@RequestParam("questId") Long questId);
 }

--
Gitblit v1.7.1