From 7327c2b113573bccaeef5b3fc5c82011abc00cd8 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 15:58:03 +0800
Subject: [PATCH] 设备，车辆接口修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index cf7eb95..54c87ed 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -15,7 +15,7 @@
     <!--派遣记录分页数据-->
     <select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
         select
-            sd.*,bu.real_name securityName,sdu.name dispatcherCompany
+            sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid idCardNo
         from
             sys_dispatcher sd
         left join
@@ -45,11 +45,11 @@
         <if test="dispatcher.dispatcherCompany!=null and  dispatcher.dispatcherCompany!=''">
             and sdu.name like concat('%', #{dispatcher.dispatcherCompany},'%')
         </if>
-        <if test="dispatcher.beginTime!=null and  dispatcher.beginTime!=''">
-            and sd.dispatcherTime &gt;  #{dispatcher.beginTime}
-        </if>
-        <if test="dispatcher.overTime!=null and  dispatcher.overTime!=''">
-            and sd.end_time &lt;  #{dispatcher.overTime}
+        <if test="dispatcher.beginTime!=null or dispatcher.overTime!=null">
+            <if test="dispatcher.beginTime!='' or dispatcher.overTime!=''">
+                and sd.end_time &lt;= #{dispatcher.overTime} and sd.end_time &gt;= #{dispatcher.beginTime}
+                or ( sd.dispatcherTime &lt;= #{dispatcher.overTime} and sd.dispatcherTime &gt;= #{dispatcher.beginTime})
+            </if>
         </if>
     </select>
 
@@ -74,7 +74,7 @@
         select ifnull(count(*),0) count from sys_dispatcher
         where
         1=1
-        and dispatcher_unit_id #{dispatcherUnitVO1.id}
+        and dispatcher_unit_id = #{dispatcherUnitVO1.id}
     </select>
 
 </mapper>

--
Gitblit v1.9.3