From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口，考试开始，修改考试的状态为考试中 3.考试查询接口修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 50 insertions(+), 3 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 68238ba..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,12 +10,59 @@
         <result column="dispatcher" property="dispatcher"/>
         <result column="dispatcherTime" property="dispatchertime"/>
         <result column="dispatcherAddress" property="dispatcheraddress"/>
-        <result column="dispatchercompany" property="dispatchercompany"/>
     </resultMap>
 
+    <!--派遣记录分页数据-->
+    <select id="selectDispatcherPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.*,sd.name securityName,sdu.name dispatcherCompany
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        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>
+        <if test="dispatcher.cardid!=null and  dispatcher.cardid!=''">
+            and sd.cardid like concat('%', #{dispatcher.cardid},'%')
+        </if>
+        <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 &gt;  #{dispatcher.beginTime}
+        </if>
+        <if test="dispatcher.overTime!=null and  dispatcher.overTime!=''">
+            and sd.end_time &lt;  #{dispatcher.overTime}
+        </if>
+    </select>
 
-    <select id="selectDispatcherPage" resultMap="dispatcherResultMap">
-        select * from sys_dispatcher where is_deleted = 0
+    <!--派遣记录详情-->
+    <select id="getDispatcherInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+        select
+            sd.*,sdu.name dispatcherCompany
+        from
+            sys_dispatcher sd
+        left join
+            sys_dispatcher_unit sdu
+        on
+            sdu.id = sd.dispatcher_unit_id
+        where 1=1
+        <if test="dispatcher.id!=null">
+            and sd.id = #{dispatcher.id}
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3