Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-13 e74987c5c7e6256e84a0852f36a367bf8f2e032d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -9,6 +9,7 @@
import com.panzhihua.common.model.vos.community.*;
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;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
@@ -131,6 +132,15 @@
     */
    @PostMapping("pagedynamic")
    R pageDynamic(@RequestBody ComActDynVO comActDynVO);

    /**
     * 管理后台分页查询社区动态
     *
     * @param comActDynVO 查询参数
     * @return 动态集合
     */
    @PostMapping("pagedynamicByAdmin")
    R pageDynamicByAdmin(@RequestBody ComActDynVO comActDynVO);

    /**
     * 社区动态详情
@@ -1638,22 +1648,22 @@
    R getPopulationLists(@RequestBody List<Long> Ids);

    /**
     * 新增社区问卷
     * 创建调查问卷
     *
     * @param questnaireVO
     * @return
     */
    @PostMapping("/questnaire/addquestnaire")
    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO);
    R addQuestnaire(@RequestBody QuestnaireVO questnaireVO, @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);

    /**
     * 新增社区问卷
     * 社区问卷列表
     *
     * @param questnaireVO
     * @param pageQuestnaireDTO
     * @return
     */
    @PostMapping("/questnaire/pagequestnaire")
    R pageQuestnaire(@RequestBody QuestnaireVO questnaireVO);
    R pageQuestnaire(@RequestBody PageQuestnaireDTO pageQuestnaireDTO, @RequestParam("communityId") Long communityId);


    /**
@@ -1663,7 +1673,7 @@
     * @return
     */
    @PostMapping("/questnaire/editquestnaire")
    R editQuestnaire(@RequestBody QuestnaireVO questnaireVO);
    R editQuestnaire(@RequestBody QuestnaireVO questnaireVO) ;


    /**
@@ -1682,5 +1692,66 @@
     * @return
     */
    @PostMapping("/questnaire/deletequestnaire")
    R editQuestnaireDO(@RequestParam("questId") Long questId);
    R editQuestnaireDO(@RequestParam("questId") Long questId,@RequestParam("userId") Long userId);

    /**
     * 问卷答题结果
     *
     * @param questId 问卷ID
     */
    @PostMapping("/questnaire/answerslist")
    R answerResultList(@RequestParam("questId") Long questId);


    /**
     * 问卷调查详细
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @GetMapping("/questnaire/view")
    R view(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 用户问卷调查详细
     * @param userId 用户ID
     * @param questId 问卷ID
     * @return 用户问卷调查详细
     */
    @GetMapping("/questnaire/usersanswer")
    R answerInfoQuestnaire(@RequestParam("userId") Long userId, @RequestParam("questId") Long questId);

    /**
     * 查看用户问卷调查统计信息
     * @param questId 问卷ID
     * @return 用户问卷调查统计信息
     */
    @GetMapping("/questnaire/stat")
    R statistics(@RequestParam("questId") Long questId);


    /**
     * 问卷题目 答卷信息
     *
     * @param pageQuestnaireSubDetailsDTO 问卷ID
     */
    @PostMapping("/questnaire/qaqeustanswerdetails")
    R qaQeustAnswerDetails(@RequestBody PageQuestnaireSubDetailsDTO pageQuestnaireSubDetailsDTO);


    /**
     * 社区问卷分页
     * @param pageQuestnaireAnswerDTO 社区问卷分页参数
     * @return 分页数据
     */
    @PostMapping("/questnaire/pagequestnaireanswer")
    R pageQuestnaireAnswer(@RequestBody PageQuestnaireAnswerDTO pageQuestnaireAnswerDTO);


    /**
     * 居民填写问卷调查问卷
     * @param usersAnswerQuestnaireVO 填写情况
     */
    @PostMapping("/questnaire/usersanswequestnaire")
    R usersAnsweQuestnaire(@RequestBody UsersAnswerQuestnaireVO usersAnswerQuestnaireVO, @RequestParam("userId") Long userId);

}