Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

manailin

2021-08-19 62d2377c27bf65a048a7c104b256efcd32ad2319

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActQuestnaireService.java

@@ -3,6 +3,7 @@
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;
@@ -18,12 +19,19 @@
     *
     * @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);

    /**
     * 编辑问卷——问卷、题目、选项
@@ -33,7 +41,7 @@
    /**
     * 修改问卷状态
     */
    R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo, Long userId);
    R editQuestnaireDO(EditComActQuestnaireVo editComActQuestnaireVo);

    /**
     * 删除问卷  ——隐藏
@@ -90,8 +98,34 @@
    /**
     * 居民填写问卷调查问卷
     * @param usersAnswerQuestnaireVO
     * @param userId
     * @return
     */
    R usersAnsweQuestnaire(UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, Long userId);
    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);

    R statisticsSummary(StatisticsSummaryDTO summaryDTO);

    R statisticsSummaryExport(Long questId);

    R statisticsSummaryHeader(Long questId);

    R timedTaskQuestionnaire();

    R addQuestnaireView(Long questId);

    R addNoNotice(Long questId,Long userId);
}