From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   38 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 37 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..aaa4e70 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -15,19 +15,27 @@
     <!--派遣记录分页数据-->
     <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 idCardNo
         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}
         </if>
         <if test="dispatcher.deptId!=null">
             and sd.dept_id = #{dispatcher.deptId}
+        </if>
+        <if test="dispatcher.dispatch!=null and dispatcher.dispatch!=''">
+            and bu.dispatch = #{dispatcher.dispatch}
+            and sd.status = #{dispatcher.dispatch}
         </if>
         <if test="dispatcher.userIds!=null and  dispatcher.userIds!=''">
             and sd.user_ids like concat('%', #{dispatcher.userIds},'%')
@@ -40,6 +48,12 @@
         </if>
         <if test="dispatcher.dispatcherCompany!=null and  dispatcher.dispatcherCompany!=''">
             and sdu.name like concat('%', #{dispatcher.dispatcherCompany},'%')
+        </if>
+        <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>
 
@@ -59,4 +73,26 @@
         </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>
+
+    <!--查询用的派遣信息-->
+    <select id="getDispatcherInfoByUserId" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.*
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        on
+            sdu.id = sd.dispatcher_unit_id
+        where sd.user_ids = #{userId}
+        and sd.status = 0
+    </select>
+
 </mapper>

--
Gitblit v1.9.3