Merge branch 'txb'

tangxiaobao

2021-08-18 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java

@@ -6,12 +6,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.panzhihua.common.model.dtos.community.bigscreen.event.ScreenEventListDTO;
import com.panzhihua.common.model.dtos.grid.*;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventGridIncidentStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.EventListVO;
import com.panzhihua.common.model.vos.grid.*;
import com.panzhihua.common.model.vos.screen.DateScreenVO;
import com.panzhihua.common.model.vos.screen.EventDetailWorkVO;
import com.panzhihua.common.model.vos.screen.EventTypeWorkVO;
import com.panzhihua.common.model.vos.screen.EventWorkVO;
import com.panzhihua.common.model.vos.screen.*;
import com.panzhihua.service_grid.model.dos.EventDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -57,7 +56,7 @@
     * @param gridMemberId  网格员id
     * @return  头像url
     */
    String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
    Map<String,String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);

    /**
     * 查询事件（管理）列表
@@ -130,4 +129,16 @@
    EventTypeWorkVO getComplete(@Param("communityId") Long communityId);

    EventTypeWorkVO getNoComplete(@Param("communityId") Long communityId);

    Map<String,Long> getSSPEventTotal(@Param("communityId") Long communityId);

    List<EventGridIncidentStatisticsVO> getEventListByCommunityId(@Param("communityId") Long communityId);

    List<CivilVillageStatisticsVO> getCivilScreenVillageList(@Param("communityId") Long communityId);

    ScreenDrawEventPopulationTotalVO getVillagePopulationTotal(@Param("villageId") Long villageId);

    List<Map<String,Object>> getMemberBuildName(@Param("userId") Long userId);

    Integer getPopulationByLabelCount(@Param("floor") String floor,@Param("villageId") Long villageId);
}