From eda58e0e6d4abdd2b060e28867d103045845aa69 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 30 八月 2021 13:13:18 +0800
Subject: [PATCH] Merge branch 'test' into 'yuyue_dev'
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java
index fca8141..2b40f5f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridMemberRelationMapper.java
@@ -1,5 +1,9 @@
package com.panzhihua.service_grid.dao;
+import java.util.List;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,17 +11,13 @@
import com.panzhihua.common.model.dtos.grid.EventGridCascadeListDTO;
import com.panzhihua.common.model.dtos.grid.MemberStatisticsAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridMemberRelationDTO;
+import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
import com.panzhihua.common.model.vos.grid.EventMapGridCascadeVO;
import com.panzhihua.common.model.vos.grid.EventMapGridVO;
import com.panzhihua.common.model.vos.grid.EventStatisticsMemberAdminVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberCascadeVO;
import com.panzhihua.common.model.vos.grid.admin.GridMemberLcListVO;
import com.panzhihua.service_grid.model.dos.EventGridMemberRelationDO;
-import com.panzhihua.common.model.vos.grid.EventGridMemberRelationVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
/**
* DAO
@@ -36,29 +36,36 @@
* @param pageEventGridMemberRelationDTO
* @return
*/
- IPage<EventGridMemberRelationVO> findByPage(Page page, @Param("pageEventGridMemberRelationDTO") PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);
+ IPage<EventGridMemberRelationVO> findByPage(Page page,
+ @Param("pageEventGridMemberRelationDTO") PageEventGridMemberRelationDTO pageEventGridMemberRelationDTO);
/**
* 根据网格员id查询关联网格列表
- * @param userId 网格员id
- * @return 网格列表
+ *
+ * @param userId
+ * 网格员id
+ * @return 网格列表
*/
List<EventMapGridVO> getMapGridListByApp(@Param("userId") Long userId);
/**
* 后台管理-网格员统计
- * @param statisticsAdminDTO 请求参数
- * @return 网格员统计信息
+ *
+ * @param statisticsAdminDTO
+ * 请求参数
+ * @return 网格员统计信息
*/
- IPage<EventStatisticsMemberAdminVO> gridMemberStatistics(Page page, @Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO);
+ IPage<EventStatisticsMemberAdminVO> gridMemberStatistics(Page page,
+ @Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO);
/**
* 查询市平台网格员列表
- * @return 市平台网格员列表
+ *
+ * @return 市平台网格员列表
*/
List<GridMemberLcListVO> getGridMemberLcList();
- List<GridMemberCascadeVO> getGridMemberCascade(@Param("type") Integer type,@Param("id") Long id);
+ List<GridMemberCascadeVO> getGridMemberCascade(@Param("type") Integer type, @Param("id") Long id);
Integer getVillageCount(@Param("communityId") Long communityId);
@@ -66,8 +73,10 @@
List<EventMapGridVO> getMapGridListsByApp(@Param("cascadeListDTO") EventGridCascadeListDTO cascadeListDTO);
- List<EventMapGridCascadeVO> getMapGridsListsByApp(@Param("userId") Long userId, @Param("type") Integer type, @Param("communityId") Long communityId);
+ List<EventMapGridCascadeVO> getMapGridsListsByApp(@Param("userId") Long userId, @Param("type") Integer type,
+ @Param("communityId") Long communityId);
- List<EventStatisticsMemberAdminVO> gridMemberStatisticsAll(@Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO);
+ List<EventStatisticsMemberAdminVO>
+ gridMemberStatisticsAll(@Param("statisticsAdminDTO") MemberStatisticsAdminDTO statisticsAdminDTO);
}
--
Gitblit v1.7.1