From c64da5152d32c366eecfb20b3fdc023be1d27681 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 14 七月 2021 15:26:19 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 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 4816b9a..aa8555c 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
@@ -8,6 +8,10 @@
 import com.panzhihua.common.model.dtos.grid.*;
 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.service_grid.model.dos.EventDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -53,7 +57,7 @@
      * @param gridMemberId  网格员id
      * @return  头像url
      */
-    String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
+    Map<String,String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
 
     /**
      * 查询事件(管理)列表
@@ -115,4 +119,17 @@
      */
     IPage<EventSpecialPopulationVO> specialPopulationList(Page page, @Param("specialPopulationDTO") PageEventSpecialPopulationDTO specialPopulationDTO);
 
+    Map<String,Long> countByCommunityId(@Param("communityId") Long communityId,@Param("nowDate")String nowDate);
+
+    DateScreenVO countByAvgCommunityId(@Param("communityId") Long communityId);
+
+    List<EventDetailWorkVO> getWorkScreenEventList(@Param("communityId") Long communityId);
+
+    EventWorkVO countByTime(@Param("start")String start, @Param("end")String end, @Param("communityId")Long communityId);
+
+    EventTypeWorkVO getComplete(@Param("communityId") Long communityId);
+
+    EventTypeWorkVO getNoComplete(@Param("communityId") Long communityId);
+
+    Map<String,Long> getSSPEventTotal(@Param("communityId") Long communityId);
 }

--
Gitblit v1.7.1