From 0a35a244f60da0d01a3a9142ed154fa9a83c4ad4 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 03 六月 2021 18:25:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java |   68 ++++++++++++++++++++++++++--------
 1 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
index 8b78e3f..70f8633 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventService.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.panzhihua.common.model.dtos.grid.*;
 import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComActVO;
 import com.panzhihua.common.model.vos.grid.EventDetailsVO;
 import com.panzhihua.common.model.vos.grid.EventVO;
 import com.panzhihua.service_grid.model.dos.EventDO;
@@ -19,20 +20,6 @@
 public interface EventService extends IService<EventDO> {
 
     /**
-     * 新增事件
-     * @param eventAddDTO
-     * @return 新增结果
-     */
-    R add(EventAddDTO eventAddDTO);
-
-    /**
-     * 修改事件
-     * @param eventEditDTO
-     * @return 维护结果
-     */
-    R edit(EventEditDTO eventEditDTO);
-
-    /**
      * 分页查找事件
      * @param pageEventDTO
      * @return 维护结果
@@ -41,10 +28,10 @@
 
     /**
      * 删除事件
-     * @param CommonEventDeleteDTO
+     * @param commonEventDeleteDTO
      * @return 平台用户信息
      */
-    R delete(CommonEventDeleteDTO CommonEventDeleteDTO);
+    R delete(CommonEventDeleteDTO commonEventDeleteDTO);
 
     /**
      * 查询事件详细信息
@@ -107,4 +94,53 @@
      * @return
      */
     R draftRelease(CommonEventPublicDTO commonEventPublicDTO);
+
+    /**
+     * 保存殊人群事件上报草稿
+     * @param specialEventEditDTO
+     * @return
+     */
+    R saveSpecialDraft(SpecialEventEditDTO specialEventEditDTO);
+
+    /**
+     * 特殊人员信息上报
+     * @param specialEventAddDTO
+     * @return
+     */
+    R addSpecial(SpecialEventAddDTO specialEventAddDTO);
+
+
+    /**
+     * 获取指定特殊人员信息
+     * @param idCard
+     * @return
+     */
+    R getSpecialPopulation(String idCard);
+
+    /**
+     * 添加发布宣传教育事件
+     * @param publicityEventAddDTO   请求参数
+     * @return  上报结果
+     */
+    R addPublicity(PublicityEventAddDTO publicityEventAddDTO);
+
+    /**
+     * 保存宣传教育事件草稿
+     * @param publicityEventEditDTO   请求参数
+     * @return  保存结果
+     */
+    R savePublicityDraft(PublicityEventEditDTO publicityEventEditDTO);
+
+    /**
+     * 分页查询宣传教育事件
+     * @param pagePublicityEventDTO
+     * @return
+     */
+    R selectPublicity(PagePublicityEventDTO pagePublicityEventDTO);
+
+    /**
+     * 获取社区列表:当前默认所有社区
+     * @return
+     */
+    R<ComActVO> actList();
 }

--
Gitblit v1.7.1