From faa40222f2e15b68a89d2180b57d444de5b67709 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期一, 31 五月 2021 13:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
index 15697c4..49043f9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java
@@ -1,32 +1,50 @@
package com.panzhihua.service_grid.dao;
-
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.grid.PageEventDTO;
+import com.panzhihua.common.model.dtos.grid.PagePublicityEventDTO;
+import com.panzhihua.common.model.vos.grid.ComMapGridEventVO;
import com.panzhihua.service_grid.model.dos.EventDO;
import com.panzhihua.common.model.vos.grid.EventVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* DAO
*
* @author cedoo email:cedoo(a)qq.com
* @version 1.0
- * @since 1.0
* @date 2021-05-26
- * */
+ * @since 1.0
+ */
@Mapper
public interface EventMapper extends BaseMapper<EventDO> {
- /**
- * 分页查询
- * @param pageEventDTO
- * @return
- */
- IPage<EventVO> findByPage(Page page, @Param("pageEventDTO")PageEventDTO pageEventDTO);
+ /**
+ * 分页查询事件
+ *
+ * @param pageEventDTO
+ * @return
+ */
+ IPage<EventVO> findByPage(Page page, @Param("pageEventDTO") PageEventDTO pageEventDTO);
+
+ /**
+ * 分页查询宣传教育
+ *
+ * @param pagePublicityEventDTO
+ * @return
+ */
+ IPage<EventVO> findPublicityByPage(Page page, @Param("pagePublicityEventDTO") PagePublicityEventDTO pagePublicityEventDTO);
+ /**
+ * 地图模块-根据网格id查询网格办件事件
+ * @param gridId 网格id
+ * @return 网格办件事件
+ */
+ List<ComMapGridEventVO> getEventByGridId(@Param("gridId") Long gridId);
}
--
Gitblit v1.7.1