From a4aa79a8fd9a40b34bac8ebb153f7ab1977282d3 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期五, 09 四月 2021 15:45:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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 80dab75..18252ec 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
@@ -2,6 +2,7 @@
 
 import com.panzhihua.common.model.dtos.community.PageQuestnaireDTO;
 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;
 
 /**
@@ -14,33 +15,41 @@
      *
      * @return
      */
-    R AddQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
+    R addQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
 
     /**
      * 社区问卷列表
      */
-    R PageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+    R pageQuestnaire(PageQuestnaireDTO pageQuestnaireDTO);
+
+    /**
+     * 编辑问卷——问卷、题目、选项
+     */
+    R editQuestnaire(QuestnaireVO questnaireVO);
 
     /**
      * 修改问卷状态
      */
-    R editQuestnaire(QuestnaireVO questnaireVO, Long communityId, Long userId);
+    R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId);
 
     /**
      * 删除问卷  ——隐藏
-     * @param queId 问卷调查ID
+     *
+     * @param questId 问卷调查ID
      * @return
      */
-    R deleteQuestnaire(Long queId);
+    R deleteQuestnaire(Long questId, Long userId);
 
     /**
      * 问卷详情-调查结果统计
+     *
      * @param questId 问卷ID
      */
     R statQuestnaire(Long questId);
 
     /**
      * 问卷详细-问卷查看
+     *
      * @param questId
      * @return
      */
@@ -48,6 +57,7 @@
 
     /**
      * 问卷答题详情
+     *
      * @param userId  用户ID
      * @param questId 问卷ID
      */

--
Gitblit v1.7.1