From 28e8b38e9de8cc76084d0af6a96d2d9d1e1f739f Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 27 十月 2022 13:28:32 +0800
Subject: [PATCH] Merge branch 'local_20221024' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/DiscussApi.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 8ac1930..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);
}
/**
@@ -338,4 +358,14 @@
public R timedTaskWriteDiscussViewNumToTable() {
return comActDiscussService.writeDiscussViewNumToTable();
}
+
+ /**
+ * 一起议获取是否有发布权
+ * @param comActDiscussDTO
+ * @return
+ */
+ @PostMapping("discuss/permissions")
+ public R getDiscussPermissions(@RequestBody ComActDiscussDTO comActDiscussDTO) {
+ return comActDiscussService.getDiscussPermissions(comActDiscussDTO);
+ }
}
--
Gitblit v1.7.1