From fc70fad3cf843e6d2523c38fdd65fc48037f5fb6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 22 八月 2022 15:41:12 +0800
Subject: [PATCH] bug修改

---
 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 2dd623d..8f544d8 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;
@@ -1635,12 +1637,12 @@
     /**
      * 议事投票-投票
      *
-     * @param comActDiscussOptionUserDTO
+     * @param discussVoteOptionDTO
      *            投票信息
      * @return 投票结果
      */
     @PostMapping("adddiscussoptionuser")
-    R addDiscussOptionUser(@RequestBody ComActDiscussOptionUserDTO comActDiscussOptionUserDTO);
+    R addDiscussOptionUser(@RequestBody DiscussVoteOptionDTO discussVoteOptionDTO);
 
     /**
      * 议事投票-评论-点赞、取消点赞
@@ -5058,7 +5060,7 @@
      * @return 社区列表
      */
     @GetMapping("/eventgrid/community/westList")
-    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
+    R getWestCommunityLists(@RequestParam(value = "areaCode",required = false)String areaCode);
 
     /**
      * 综治app-小区列表
@@ -5660,6 +5662,9 @@
 
     @PostMapping("/reserve/commitNoToken")
     R reserveCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
+
+    @PostMapping("/reserve/homeQuarantine/commitNoToken")
+    R homeQuarantineCommitNoToken(@RequestBody ComActReserveCommitVO comActReserveCommitVO);
     /**
      * 我的预约/登记
      * @param pageUserReserveDTO
@@ -10314,4 +10319,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