From a841e7d34df4edf9955da8e1db09ed8de079ad95 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 19:23:44 +0800
Subject: [PATCH] 1.现场检查新增字段 2.用户表新增是否缴纳保险字段 3.统计接口新增，修改

---
 src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherUnitMapper.xml |   23 +++++++++++++++++++----
 1 files changed, 19 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 fa68e96..827e15d 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,21 @@
     <!--派遣公司分页信息-->
     <select id="selectDispatcherUnitPage" resultType="org.springblade.modules.dispatcher.vo.DispatcherUnitVO">
         select
-            sdu.*,bt.dept_name tenantName
+        sdu.*,bt.dept_name tenantName,bu.real_name realName
         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_dispatcher sd
+        on
+        sdu.id = sd.dispatcher_unit_id
+        left join
+        blade_user bu
+        on
+        sd.user_ids = bu.id
         WHERE
             1=1
         <if test="dispatcherUnit.tenantName!=null and  dispatcherUnit.tenantName!=''">
@@ -41,6 +49,13 @@
         <if test="dispatcherUnit.district!=null">
             and sdu.district = #{dispatcherUnit.district}
         </if>
+        <if test="dispatcherUnit.isExpire==1">
+            and sdu.start_time &lt;= now()
+            and sdu.end_time &gt; now()
+        </if>
+        <if test="dispatcherUnit.isExpire==2">
+            and sdu.end_time &lt;= now()
+        </if>
     </select>
 
     <!--自定义树-->

--
Gitblit v1.9.3