From f63fff71fcd7a62ad73b0b9eda614f3b1fa3badf Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 22 Oct 2021 22:51:09 +0800
Subject: [PATCH] 考试成绩修改状态重置

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 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 5f5cf52..c1f9073 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml
@@ -5,13 +5,17 @@
     <!--派遣公司分页信息-->
     <select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
         select
-            sdu.*,bt.dept_name deptName
+            sdu.*,bt.dept_name deptName,sj.dept_name jurisdictionName
         from
             sys_dispatcher_unit sdu
         LEFT JOIN
             blade_dept bt
         ON
             sdu.dept_id = bt.id
+        left join
+            sys_jurisdiction sj
+        on
+            sj.id = sdu.jurisdiction
         WHERE
             1=1
         <if test="dispatcherUnit.deptName!=null and  dispatcherUnit.deptName!=''">
@@ -33,14 +37,19 @@
             and sdu.city = #{dispatcherUnit.city}
         </if>
         <if test="dispatcherUnit.jurisdiction!=null">
-            and sdu.jurisdiction = #{dispatcherUnit.jurisdiction}
+            and (sj.id = #{dispatcherUnit.jurisdiction} or sj.parent_id = #{dispatcherUnit.jurisdiction})
+        </if>
+        <if test="dispatcherUnit.deptId!=null and dispatcherUnit.deptId!=''">
+            and sdu.dept_id = #{dispatcherUnit.deptId}
         </if>
         <if test="dispatcherUnit.district!=null">
             and sdu.district = #{dispatcherUnit.district}
         </if>
         <if test="dispatcherUnit.beginTime!=null or dispatcherUnit.overTime!=null">
-            and sdu.end_time &lt;= #{dispatcherUnit.overTime} and sdu.end_time &gt;= #{dispatcherUnit.beginTime}
-            or ( sdu.start_time &lt;= #{dispatcherUnit.overTime} and sdu.start_time &gt;= #{dispatcherUnit.beginTime})
+            <if test="dispatcherUnit.beginTime!='' or dispatcherUnit.overTime!=''">
+                and sdu.end_time &lt;= #{dispatcherUnit.overTime} and sdu.end_time &gt;= #{dispatcherUnit.beginTime}
+                or ( sdu.start_time &lt;= #{dispatcherUnit.overTime} and sdu.start_time &gt;= #{dispatcherUnit.beginTime})
+            </if>
         </if>
     </select>
 
@@ -59,6 +68,9 @@
         <if test="dispatcherUnit.deptName!=null and  dispatcherUnit.deptName!=''">
             and bt.dept_name like concat('%', #{dispatcherUnit.deptName},'%')
         </if>
+        <if test="dispatcherUnit.deptId!=null and  dispatcherUnit.deptId!=''">
+            and sdu.dept_id like concat('%', #{dispatcherUnit.deptId},'%')
+        </if>
         <if test="dispatcherUnit.name!=null and  dispatcherUnit.name!=''">
             and sdu.name like concat('%', #{dispatcherUnit.name},'%')
         </if>

--
Gitblit v1.9.3