From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml |   35 +++++++++++++++++++++++++++++++++++
 1 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml b/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
index c7e9b90..49f316b 100644
--- a/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
+++ b/src/main/java/org/springblade/modules/location/mapper/LiveLocationMapper.xml
@@ -214,8 +214,43 @@
 
 
 
+    <!--查询指令接收人的定位信息-->
+    <select id="getDirectiveLiveLocationVo" resultType="org.springblade.modules.location.vo.LiveLocationVo">
+        select
+        *
+        from
+        sys_live_location
+        where
+        1=1
+        <if test="liveLocation.type!=null and liveLocation.type!=''">
+            and type = #{liveLocation.type}
+        </if>
+        <if test="liveLocation.workerId!=null and liveLocation.workerId!=''">
+            and worker_id = #{liveLocation.workerId}
+        </if>
+    </select>
 
 
+    <!--查询指令接收人的定位信息-->
+    <select id="getDirectiveLocusInfoList" resultType="org.springblade.modules.location.vo.LocusVo">
+        select
+        sl.*
+        from
+        sys_locus sl
+        left join
+        sys_live_location sll
+        on
+        sll.id = sl.live_location_id
+        where
+        1=1
+        <if test="liveLocation.type!=null and liveLocation.type!=''">
+            and sll.type = #{liveLocation.type}
+        </if>
+        <if test="liveLocation.workerId!=null and liveLocation.workerId!=''">
+            and sll.worker_id = #{liveLocation.workerId}
+        </if>
+    </select>
+
 
 
 

--
Gitblit v1.9.3