From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +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 |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 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 18252ec..0719cfb 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
@@ -1,9 +1,12 @@
 package com.panzhihua.service_community.service;
 
+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.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
@@ -20,7 +23,7 @@
     /**
      * 社区问卷列表
      */
-    R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+    R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO, Long communityId);
 
     /**
      * 编辑问卷——问卷、题目、选项
@@ -62,4 +65,33 @@
      * @param questId 问卷ID
      */
     R answerInfoQuestnaire(Long userId, Long questId);
+
+    /**
+     * 问卷答题结果
+     *
+     * @param questId 问卷ID
+     */
+    R answerResultList(Long questId);
+
+    /**
+     * 问答题详细回答列表
+     * @param pageQuestnaireSubDetailsDTO 分页查询参数
+     * @return 分页查询结果
+     */
+    R qaQeustDetails(PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);
+
+    /**
+     * 社区问卷 回答分页信息
+     * @param pageQuestnaireAnswerDTO 分页查询数据
+     * @return 分页信息
+     */
+    R pageQuestnaireAnswer(PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);
+
+    /**
+     * 居民填写问卷调查问卷
+     * @param usersAnswerQuestnaireVO
+     * @param userId
+     * @return
+     */
+    R usersAnsweQuestnaire(UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, Long userId);
 }

--
Gitblit v1.7.1