From 1859ea0a7a1eead549f39d4216a9a0d9ec757fb2 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期二, 13 四月 2021 13:14:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 76 ++++++++++++++++++++++++++++++++++---
1 files changed, 69 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 5567c69..8dcf81a 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
@@ -133,6 +133,15 @@
R pageDynamic(@RequestBody ComActDynVO comActDynVO);
/**
+ * 管理后台分页查询社区动态
+ *
+ * @param comActDynVO 查询参数
+ * @return 动态集合
+ */
+ @PostMapping("pagedynamicByAdmin")
+ R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);
+
+ /**
* 社区动态详情
*
* @param id 动态id
@@ -1638,22 +1647,22 @@
R getPopulationLists(@RequestBody List<Long> Ids);
/**
- * 新增社区问卷
+ * 创建调查问卷
*
* @param questnaireVO
* @return
*/
@PostMapping("/questnaire/addquestnaire")
- R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
/**
- * 新增社区问卷
+ * 社区问卷列表
*
- * @param questnaireVO
+ * @param pageQuestnaireDTO
* @return
*/
@PostMapping("/questnaire/pagequestnaire")
- R pageQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);
/**
@@ -1663,7 +1672,7 @@
* @return
*/
@PostMapping("/questnaire/editquestnaire")
- R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
+ R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ;
/**
@@ -1682,5 +1691,58 @@
* @return
*/
@PostMapping("/questnaire/deletequestnaire")
- R editQuestnaireDO(@RequestParam("questId") Long questId);
+ 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