From 62d2377c27bf65a048a7c104b256efcd32ad2319 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 19 八月 2021 17:53:40 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 94 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index 7db9951..daf0835 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.SystemmanagementConfigVO;
import com.panzhihua.common.model.vos.community.*;
@@ -1420,32 +1421,56 @@
}
}
+ /**
+ * 小程序-问卷调查详情
+ * @param userId 用户id
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/view/detail")
+ public R viewDetail(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId) {
+ return comActQuestnaireService.getQuesDetail(questId,userId);
+ }
+
+ /**
+ * 社区后台-查询问卷调查详情
+ * @param questId 问卷id
+ * @return 问卷调查详情
+ */
+ @GetMapping("questnaire/admin/detail")
+ public R quesDetail( @RequestParam("questId") Long questId) {
+ return comActQuestnaireService.getQuesDetailAdmin(questId);
+ }
+
/**
* 新增社区问卷
* @param questnaireVO
* @return
*/
- @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/addquestnaire")
- public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
- return comActQuestnaireService.addQuestnaire(questnaireVO, communityId, userId);
+ public R addQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
+ return comActQuestnaireService.addQuestnaire(questnaireVO);
}
/**
- * 社区问卷列表
- * @param pageQuestnaireDTO
- * @return
+ * 小程序-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
*/
@PostMapping("questnaire/pagequestnaire")
- public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO,@RequestParam("communityId") Long communityId) {
- if(pageQuestnaireDTO.getForParty()==null){
- pageQuestnaireDTO.setForParty(false);
- }
- if(pageQuestnaireDTO.getForVolunteer()==null){
- pageQuestnaireDTO.setForVolunteer(false);
- }
- return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO, communityId);
+ public R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaire(pageQuestnaireDTO);
+ }
+
+ /**
+ * 社区后台-社区问卷列表
+ * @param pageQuestnaireDTO 请求参数
+ * @return 社区问卷列表
+ */
+ @PostMapping("questnaire/admin/pagequestnaire")
+ public R pageQuestnaireAdmin(@RequestBody PageQuestnaireDTO pageQuestnaireDTO) {
+ return comActQuestnaireService.pageQuestnaireAdmin(pageQuestnaireDTO);
}
/**
@@ -1453,7 +1478,6 @@
* @param questnaireVO
* @return
*/
- @Transactional(rollbackFor = Exception.class)
@PostMapping("questnaire/editquestnaire")
public R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) {
return comActQuestnaireService.editQuestnaire(questnaireVO);
@@ -1465,8 +1489,8 @@
* @return
*/
@PostMapping("questnaire/editquestnairedo")
- public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo, @RequestParam("userId") Long userId) {
- return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo, userId);
+ public R editQuestnaireDO(@RequestBody EditComActQuestnaireVo editComActQuestnaireVo) {
+ return comActQuestnaireService.editQuestnaireDO(editComActQuestnaireVo);
}
/**
@@ -1520,12 +1544,16 @@
}
/**
- * 居民填写问卷调查问卷
- * @param usersAnswerQuestnaireVO
+ * 居民填写问卷调查问卷questnaire/pagequestnaire
*/
@PostMapping("questnaire/usersanswequestnaire")
- public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO,@RequestParam("userId") Long userId){
- return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO,userId);
+ public R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO){
+ return comActQuestnaireService.usersAnsweQuestnaire(usersAnswerQuestnaireVO);
+ }
+
+ @GetMapping("questnaire/add/noNotice")
+ public R addNoNotice(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId){
+ return comActQuestnaireService.addNoNotice(questId,userId);
}
/**
@@ -1812,4 +1840,28 @@
}
+ @PostMapping("questnaire/statisticsSummary")
+ public R statisticsSummary(@RequestBody StatisticsSummaryDTO summaryDTO) {
+ return comActQuestnaireService.statisticsSummary(summaryDTO);
+ }
+
+ @GetMapping("questnaire/statisticsSummary/export")
+ public R statisticsSummaryExport(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statisticsSummaryExport(questId);
+ }
+
+ @GetMapping("questnaire/statisticsSummary/header")
+ public R statisticsSummaryHeader(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.statisticsSummaryHeader(questId);
+ }
+
+ @PostMapping("timedTaskQuestionnaire")
+ public R timedTaskQuestionnaire(){
+ return comActQuestnaireService.timedTaskQuestionnaire();
+ }
+
+ @GetMapping("questnaire/add/view")
+ public R addQuestnaireView(@RequestParam("questId") Long questId) {
+ return comActQuestnaireService.addQuestnaireView(questId);
+ }
}
--
Gitblit v1.7.1