From 733edfcd6ad1c38dcf4aa761a417f4e4bfd754b2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 27 Aug 2021 11:05:44 +0800
Subject: [PATCH] 1.许可审批

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 8160c0c..ddc31d2 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -15,13 +15,17 @@
     <!--派遣记录分页数据-->
     <select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
         select
-            sd.*,sdu.name dispatcherCompany
+            sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid
         from
             sys_dispatcher sd
         left join
             sys_dispatcher_unit sdu
         on
             sdu.id = sd.dispatcher_unit_id
+        left join
+            blade_user bu
+        on
+            bu.id = sd.user_ids
         where 1=1
         <if test="dispatcher.dispatcherUnitId!=null">
             and sd.dispatcher_unit_id = #{dispatcher.dispatcherUnitId}
@@ -41,6 +45,12 @@
         <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>
     </select>
 
     <!--派遣记录详情-->
@@ -59,4 +69,12 @@
         </if>
     </select>
 
+    <!--派遣记录条数-->
+    <select id="getDispatcherCount" resultType="java.lang.Integer">
+        select ifnull(count(*),0) count from sys_dispatcher
+        where
+        1=1
+        and dispatcher_unit_id = #{dispatcherUnitVO1.id}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3