From 241408b071cb1b43d9307ae9c75c82bb77b6faa7 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期二, 20 九月 2022 17:10:27 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' into huacheng_test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index e6935de..c1d8eb7 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -4,7 +4,9 @@
 
 import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.ActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.DiscussVoteOptionDTO;
 import com.panzhihua.common.model.dtos.community.PageActivityInviteDTO;
+import com.panzhihua.common.model.dtos.community.PageVoteSituationDTO;
 import com.panzhihua.common.model.dtos.community.acid.*;
 import com.panzhihua.common.model.dtos.community.dpc.AddDpcDTO;
 import com.panzhihua.common.model.dtos.community.dpc.EditDpcDTO;
@@ -1276,7 +1278,7 @@
      * @return
      */
     @PostMapping("listadvertisement")
-    R listAdvertisement();
+    R listAdvertisement(@RequestParam("type") Integer type);
 
     /**
      * 新增广告
@@ -1635,12 +1637,12 @@
     /**
      * 议事投票-投票
      *
-     * @param comActDiscussOptionUserDTO
+     * @param discussVoteOptionDTO
      *            投票信息
      * @return 投票结果
      */
     @PostMapping("adddiscussoptionuser")
-    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
+    R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);
 
     /**
      * 议事投票-评论-点赞、取消点赞
@@ -9690,6 +9692,9 @@
     @PostMapping("/comActAcidRecord/export")
     R exportComActAcidRecord(@RequestBody ComActAcidRecordDTO comActAcidRecordDTO);
 
+    @GetMapping("/comActAcidRecord/checkCommit")
+    R checkCommit(@RequestParam(value = "userId",required = false)Long userId);
+
 
     /**
      * 5项常规统计
@@ -10317,4 +10322,28 @@
      */
     @PostMapping("/neighbor/pageRelationList")
     R pageRelationList(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
+
+    /**
+     * 投票情况-分页查询
+     * @param pageVoteSituationDTO
+     * @return
+     */
+    @PostMapping("pageVoteSituation")
+    R pageVoteSituation(@RequestBody PageVoteSituationDTO pageVoteSituationDTO);
+
+    /**
+     * 投票情况详情
+     * @param optionUserId
+     * @return
+     */
+    @GetMapping("detailVoteSituation")
+    R detailVoteSituation(@RequestParam("optionUserId") Long optionUserId);
+
+    /**
+     * 批量核对防疫信息数据
+     * @param batchCheckAcidRecordDTO
+     * @return
+     */
+    @PostMapping("/comActAcidRecord/batchCheck")
+    R batchCheck(@RequestBody BatchCheckAcidRecordDTO batchCheckAcidRecordDTO);
 }

--
Gitblit v1.7.1