From 84fae9aed66f2841b58b2ef66ff7c11cd0dbaacd Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 08 十月 2021 17:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java | 124 +++++++++++++++++++++++++++++++++++++----
1 files changed, 112 insertions(+), 12 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
index 3b721b2..5c2df35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java
@@ -3,9 +3,11 @@
import com.panzhihua.common.model.dtos.community.PageQuestnaireAnswerDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
import com.panzhihua.common.model.dtos.community.PageQuestnaireSubDetailsDTO;
+import com.panzhihua.common.model.dtos.community.questnaire.StatisticsSummaryDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.questnaire.EditComActQuestnaireVo;
import com.panzhihua.common.model.vos.community.questnaire.QuestnaireVO;
+import com.panzhihua.common.model.vos.community.questnaire.UsersAnswerQuestnaireVO;
/**
* @Author: llming
@@ -17,12 +19,21 @@
*
* @return
*/
- R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
+ R addQuestnaire(QuestnaireVO questnaireVO);
/**
- * 社区问卷列表
+ * 小程序-社区问卷列表
*/
- R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId);
+ R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+
+ /**
+ * 社区后台-社区问卷列表
+ *
+ * @param pageQuestnaireDTO
+ * 请求参数
+ * @return 社区问卷列表
+ */
+ R pageQuestnaireAdmin(PageQuestnaireDTO pageQuestnaireDTO);
/**
* 编辑问卷——问卷、题目、选项
@@ -32,12 +43,13 @@
/**
* 修改问卷状态
*/
- R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId);
+ R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo);
/**
- * 删除问卷 ——隐藏
+ * 删除问卷 ——隐藏
*
- * @param questId 问卷调查ID
+ * @param questId
+ * 问卷调查ID
* @return
*/
R deleteQuestnaire(Long questId, Long userId);
@@ -45,7 +57,8 @@
/**
* 问卷详情-调查结果统计
*
- * @param questId 问卷ID
+ * @param questId
+ * 问卷ID
*/
R statQuestnaire(Long questId);
@@ -60,29 +73,116 @@
/**
* 问卷答题详情
*
- * @param userId 用户ID
- * @param questId 问卷ID
+ * @param userId
+ * 用户ID
+ * @param questId
+ * 问卷ID
*/
R answerInfoQuestnaire(Long userId, Long questId);
/**
* 问卷答题结果
*
- * @param questId 问卷ID
+ * @param questId
+ * 问卷ID
*/
R answerResultList(Long questId);
/**
* 问答题详细回答列表
- * @param pageQuestnaireSubDetailsDTO 分页查询参数
+ *
+ * @param pageQuestnaireSubDetailsDTO
+ * 分页查询参数
* @return 分页查询结果
*/
R qaQeustDetails(PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
/**
* 社区问卷 回答分页信息
- * @param pageQuestnaireAnswerDTO 分页查询数据
+ *
+ * @param pageQuestnaireAnswerDTO
+ * 分页查询数据
* @return 分页信息
*/
R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+ /**
+ * 居民填写问卷调查问卷
+ *
+ * @param usersAnswerQuestnaireVO
+ * @return
+ */
+ R usersAnsweQuestnaire(UsersAnswerQuestnaireVO usersAnswerQuestnaireVO);
+
+ /**
+ * 社区后台-查询问卷调查详情
+ *
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ R getQuesDetailAdmin(Long questId);
+
+ /**
+ * 小程序-问卷调查详情
+ *
+ * @param userId
+ * 用户id
+ * @param questId
+ * 问卷id
+ * @return 问卷调查详情
+ */
+ R getQuesDetail(Long questId, Long userId);
+
+ /**
+ * 问卷调查统计汇总
+ *
+ * @param summaryDTO
+ * 请求参数
+ * @return 统计汇总
+ */
+ R statisticsSummary(StatisticsSummaryDTO summaryDTO);
+
+ /**
+ * 问卷调查统计汇总导出数据查询
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 调查统计汇总导出数据
+ */
+ R statisticsSummaryExport(Long questId);
+
+ /**
+ * 问卷调查统计汇总表头统计
+ *
+ * @param questId
+ * 调查问卷id
+ * @return 问卷调查统计汇总表头统计数据
+ */
+ R statisticsSummaryHeader(Long questId, Long communityId);
+
+ /**
+ * 定时任务检测待发布，调研中的问卷调查状态
+ */
+ R timedTaskQuestionnaire();
+
+ /**
+ * 小程序-新增问卷调查浏览数量
+ *
+ * @param questId
+ * 问卷调查id
+ * @return 增加结果
+ */
+ R addQuestnaireView(Long questId);
+
+ /**
+ * 小程序-用户弹窗添加不在提醒接口
+ *
+ * @param questId
+ * 问卷id
+ * @param userId
+ * 用户id
+ * @return 添加结果
+ */
+ R addNoNotice(Long questId, Long userId);
}
--
Gitblit v1.7.1