From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/dao/EventMapper.java | 9 ++++++++-
1 files changed, 8 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 903b93d..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
@@ -10,6 +10,7 @@
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;
@@ -56,7 +57,7 @@
* @param gridMemberId 网格员id
* @return 头像url
*/
- String getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
+ Map<String,String> getGridMemberImageUrl(@Param("gridMemberId") Long gridMemberId);
/**
* 查询事件（管理）列表
@@ -125,4 +126,10 @@
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