From 874043e11695651e3bc753edeaeab4d788530e20 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 30 Nov 2021 14:14:22 +0800
Subject: [PATCH] 1.押运

---
 src/main/java/org/springblade/modules/location/mapper/LocusMapper.xml |   46 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/location/mapper/LocusMapper.xml b/src/main/java/org/springblade/modules/location/mapper/LocusMapper.xml
index 78acbea..f4ec69a 100644
--- a/src/main/java/org/springblade/modules/location/mapper/LocusMapper.xml
+++ b/src/main/java/org/springblade/modules/location/mapper/LocusMapper.xml
@@ -5,21 +5,55 @@
     <!--轨迹分页信息-->
     <select id="selectLocusPage" resultType="org.springblade.modules.location.vo.LocusVo">
         SELECT
-            *
+        *
         FROM
-            sys_locus
+        sys_locus
         WHERE
-            1=1
+        1=1
+        <if test="locus.type!=null">
+            and type = #{locus.type}
+        </if>
+        <if test="locus.workerId!=null">
+            and worker_id = #{locus.workerId}
+        </if>
+        <if test="locus.beginTime!=null">
+            and record_time &gt;= #{locus.beginTime}
+        </if>
+        <if test="locus.endTime!=null">
+            and record_time &lt;=#{locus.endTime}
+        </if>
+    </select>
+
+
+    <select id="selectLocusPages" resultType="java.util.HashMap">
+        SELECT
+        *
+        FROM
+        sys_locus
+        WHERE
+        1=1
+        <if test="locus.type!=null">
+            and type = #{locus.type}
+        </if>
+        <if test="locus.workerId!=null">
+            and worker_id = #{locus.workerId}
+        </if>
+        <if test="locus.beginTime!=null">
+            and record_time &gt;= #{locus.beginTime}
+        </if>
+        <if test="locus.endTime!=null">
+            and record_time &lt;=#{locus.endTime}
+        </if>
     </select>
 
     <!--轨迹详情信息-->
     <select id="selectLocusInfo" resultType="org.springblade.modules.location.vo.LocusVo">
         SELECT
-            *
+        *
         FROM
-            sys_locus
+        sys_locus
         WHERE
-            1=1
+        1=1
         <if test="locus.id!=null">
             and id = #{locus.id}
         </if>

--
Gitblit v1.9.3