Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventGridDataMapper.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;
@@ -8,13 +12,8 @@
import com.panzhihua.common.model.dtos.grid.PageEventGridDataAdminDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridDataDTO;
import com.panzhihua.common.model.dtos.grid.PageEventGridNearbyDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.service_grid.model.dos.EventGridDataDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * DAO
@@ -33,7 +32,8 @@
     * @param eventGridDataDTO
     * @return
     */
    IPage<EventGridAdminVO> findByPage(Page page, @Param("pageEventGridDataDTO") PageEventGridDataAdminDTO eventGridDataDTO);
    IPage<EventGridAdminVO> findByPage(Page page,
        @Param("pageEventGridDataDTO") PageEventGridDataAdminDTO eventGridDataDTO);

    /**
     * 分页查询网格员所在网格
@@ -41,17 +41,22 @@
     * @param pageEventGridDataDTO
     * @return
     */
    IPage<EventGridDataVO> selectUserGrid(Page page, @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);
    IPage<EventGridDataVO> selectUserGrid(Page page,
        @Param("pageEventGridDataDTO") PageEventGridDataDTO pageEventGridDataDTO);

    /**
     * 查询当前用户网格内待处理事件统计信息
     * 
     * @param eventGridTodoDataDTO
     * @return
     */
    List<UserEventGridDataVO> getGridTodoData(@Param("eventGridTodoDataDTO") EventGridTodoDataDTO eventGridTodoDataDTO);

    /**
     * 查询社区下所有网格员
     * @param communityId   社区id
     * 
     * @param communityId
     *            社区id
     * @return  网格员列表
     */
    List<EventGridMemberAdminVO> getGridMemberLists(@Param("communityId") Long communityId);