From 34b6c77e9bcdca7bed5ed622ed22e7fe6b1961c2 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 30 Aug 2021 15:21:29 +0800
Subject: [PATCH] 1.附件
---
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 ddc31d2..0ee219b 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,bu.cardid
+ sd.*,bu.real_name securityName,sdu.name dispatcherCompany,bu.cardid idCardNo
from
sys_dispatcher sd
left join
@@ -33,6 +33,10 @@
<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>
@@ -45,11 +49,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 > #{dispatcher.beginTime}
- </if>
- <if test="dispatcher.overTime!=null and dispatcher.overTime!=''">
- and sd.end_time < #{dispatcher.overTime}
+ <if test="dispatcher.beginTime!=null or dispatcher.overTime!=null">
+ <if test="dispatcher.beginTime!='' or dispatcher.overTime!=''">
+ and sd.end_time <= #{dispatcher.overTime} and sd.end_time >= #{dispatcher.beginTime}
+ or ( sd.dispatcherTime <= #{dispatcher.overTime} and sd.dispatcherTime >= #{dispatcher.beginTime})
+ </if>
</if>
</select>
--
Gitblit v1.9.3