From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 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 843ce83..8e890e5 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -16,19 +16,39 @@
     <!--派遣记录分页数据-->
     <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,bu.phone securityPhone,
+        bd.dept_name deptName,
+        sdu.linkman,sdu.phone
         from
-            sys_dispatcher sd
+        sys_dispatcher sd
         left join
-            sys_dispatcher_unit sdu
+        sys_dispatcher_unit sdu
         on
-            sdu.id = sd.dispatcher_unit_id
+        sdu.id = sd.dispatcher_unit_id
+        left join
+        blade_user bu
+        on
+        bu.id = sd.user_ids
+        left join
+        blade_dept bd
+        on
+        bd.id = bu.dept_id
         where 1=1
+        and bu.status =1
+        and bu.is_deleted = 0
         <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},'%')
         </if>
         <if test="dispatcher.name!=null and  dispatcher.name!=''">
             and sd.name like concat('%', #{dispatcher.name},'%')
@@ -38,6 +58,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>
 
@@ -57,4 +83,15 @@
         </if>
     </select>
 
+    <!--查询派遣的保安员数量-->
+    <select id="getDispatcherNum" resultType="java.lang.Integer">
+        select
+        ifnull(count(*),0)
+        from
+        sys_dispatcher
+        where 1=1
+        and status = 0
+        and dispatcher_unit_id = #{dispatcher.id}
+    </select>
+
 </mapper>

--
Gitblit v1.9.3