From 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期四, 29 九月 2022 09:40:51 +0800 Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java index cbb9230..4c59562 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActDiscussService.java @@ -165,11 +165,11 @@ /** * 议事投票-投票 * - * @param comActDiscussOptionUserDTO + * @param discussVoteOptionDTO * 投票信息 * @return 投票结果 */ - R addDiscussOptionUser(ComActDiscussOptionUserDTO comActDiscussOptionUserDTO); + R addDiscussOptionUser(DiscussVoteOptionDTO discussVoteOptionDTO); /** * 议事投票-评论-点赞、取消点赞 @@ -249,4 +249,25 @@ * @return */ R editDiscussResult(ComActDiscussDTO comActDiscussDTO); + + /** + * 一起议获取是否有发布权 + * @param comActDiscussDTO + * @return + */ + R getDiscussPermissions(ComActDiscussDTO comActDiscussDTO); + + /** + * 投票情况-分页查询 + * @param pageVoteSituationDTO + * @return + */ + R pageVoteSituation(PageVoteSituationDTO pageVoteSituationDTO); + + /** + * 投票情况详情 + * @param optionUserId + * @return + */ + R detailVoteSituation(Long optionUserId); } -- Gitblit v1.7.1