From f2767f4dfa4a17c0a89e584047db4e3d7d91666d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 27 Aug 2021 15:21:33 +0800
Subject: [PATCH] 派遣记录，单位修改
---
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 12 ++++++------
1 files changed, 6 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..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,bu.cardid
+ 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 > #{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