From fc4813199d911650aa18d9175448a26791aef4bf Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 18 八月 2022 16:18:34 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
index 9beecb3..bd112b4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java
@@ -118,6 +118,26 @@
}
/**
+ * 投票情况-分页查询
+ * @param pageVoteSituationDTO
+ * @return
+ */
+ @PostMapping("pageVoteSituation")
+ public R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO) {
+ return comActDiscussService.pageVoteSituation(pageVoteSituationDTO);
+ }
+
+ /**
+ * 投票情况详情
+ * @param optionUserId
+ * @return
+ */
+ @GetMapping("detailVoteSituation")
+ public R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId) {
+ return comActDiscussService.detailVoteSituation(optionUserId);
+ }
+
+ /**
* 议事投票-评论-查看
*
* @param id
@@ -240,13 +260,13 @@
/**
* 议事投票-投票
*
- * @param comActDiscussOptionUserDTO
+ * @param discussVoteOptionDTO
* 投票信息
* @return 投票结果
*/
@PostMapping("adddiscussoptionuser")
- public R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO) {
- return comActDiscussService.addDiscussOptionUser(comActDiscussOptionUserDTO);
+ public R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO) {
+ return comActDiscussService.addDiscussOptionUser(discussVoteOptionDTO);
}
/**
--
Gitblit v1.7.1