From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 5492667..1c5dfa7 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -10,18 +10,12 @@
<result column="dispatcher" property="dispatcher"/>
<result column="dispatcherTime" property="dispatchertime"/>
<result column="dispatcherAddress" property="dispatcheraddress"/>
- <result column="dispatchercompany" property="dispatchercompany"/>
</resultMap>
-
-
-<!-- <select id="selectDispatcherPage" resultMap="dispatcherResultMap">-->
-<!-- select * from sys_dispatcher where is_deleted = 0-->
-<!-- </select>-->
<!--派遣记录分页数据-->
<select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
select
- sd.*,sdu.name dispatcherCompany
+ sd.*,sd.name securityName,sdu.name dispatcherCompany
from
sys_dispatcher sd
left join
@@ -29,6 +23,15 @@
on
sdu.id = sd.dispatcher_unit_id
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.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},'%')
</if>
@@ -38,6 +41,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 > #{dispatcher.beginTime}
+ </if>
+ <if test="dispatcher.overTime!=null and dispatcher.overTime!=''">
+ and sd.end_time < #{dispatcher.overTime}
+ </if>
</select>
<!--派遣记录详情-->
--
Gitblit v1.9.3