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/DispatcherUnitMapper.xml | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
index fa68e96..f7f8f1c 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,15 +5,19 @@
<!--派遣公司分页信息-->
<select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
select
- sdu.*,bt.dept_name tenantName
+ sdu.*,bt.dept_name deptName,sj.dept_name jurisdictionName
from
- sys_dispatcher_unit sdu
+ sys_dispatcher_unit sdu
LEFT JOIN
- blade_dept bt
+ blade_dept bt
ON
- sdu.dept_id = bt.id
+ sdu.dept_id = bt.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = sdu.jurisdiction
WHERE
- 1=1
+ 1=1
<if test="dispatcherUnit.tenantName!=null and dispatcherUnit.tenantName!=''">
and bt.dept_name like concat('%', #{dispatcherUnit.tenantName},'%')
</if>
@@ -41,6 +45,13 @@
<if test="dispatcherUnit.district!=null">
and sdu.district = #{dispatcherUnit.district}
</if>
+ <if test="dispatcherUnit.isExpire==1">
+ and sdu.start_time <= now()
+ and sdu.end_time > now()
+ </if>
+ <if test="dispatcherUnit.isExpire==2">
+ and sdu.end_time <= now()
+ </if>
</select>
<!--自定义树-->
--
Gitblit v1.9.3