From 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 14 十月 2021 11:07:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
index 13f4ffc..b85df83 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventGridMemberRelationMapper.xml
@@ -630,4 +630,21 @@
 		ORDER BY su.create_at desc
 	</select>
 
+	<select id="getGridsMemberList" resultType="com.panzhihua.common.model.vos.screen.GridMemberTrajectoryVo">
+		SELECT
+			egmr.grid_member_id as userId,
+			su.`name`
+		FROM
+			event_grid_member_relation AS egmr
+			left join event_grid_data as egd on egd.id = egmr.grid_id
+			INNER JOIN sys_user AS su ON su.user_id = egmr.grid_member_id
+
+			where egd.grid_community_id = #{communityId}
+	</select>
+
+	<select id="getGridsMemberTrajectory" resultType="String">
+		select lng_lat from event_grid_member_gps_log
+		where grid_member_id = #{userId} and create_at > DATE_SUB(DATE_FORMAT(CURDATE(),'%Y-%m-%d 09:00:00'),INTERVAL 0 DAY)
+	</select>
+
 </mapper>

--
Gitblit v1.7.1