From 4027720673c690cb750bd4cd25fb68574f7f47f5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 09 Nov 2021 20:14:24 +0800
Subject: [PATCH] 派遣单位查询修改

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |   25 +++++++++++++++++++------
 1 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index ee3d86d..7454e17 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -51,11 +51,11 @@
         on
         sj.id = i.jurisdiction
         LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
-        status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
+        status=1 and is_deleted = 0 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
         LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
-        status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
+        status=1 AND hold=1 and is_deleted = 0 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
         LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
-        status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+        status=1 AND dispatch=0 and is_deleted = 0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
         where 1=1
         <if test="information.enterprisename!=null and information.enterprisename!=''">
             and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
@@ -1220,7 +1220,7 @@
         IFNULL( J.num, 0 ) AS num
         FROM
         ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
-        LEFT JOIN (
+        INNER JOIN (
         SELECT
         COUNT( * ) AS num,
         dept_id
@@ -1428,7 +1428,7 @@
         A.stats,
         j.dept_name AS jurname
         FROM
-        ( SELECT jurisdiction, departmentid,enterpriseName,stats FROM sys_information ) A
+        ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
         LEFT JOIN (
         SELECT
         COUNT( * ) AS num,
@@ -1550,6 +1550,12 @@
         </if>
         <if test="stats!=null and stats!=''">
             and A.stats =#{stats}
+        </if>
+        <if test="startTime!=null and startTime!=''">
+            and A.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and A.create_time &lt;= #{endTime}
         </if>
     </select>
 
@@ -1776,7 +1782,8 @@
         i.departmentid,
         i.stats,
         i.jurisdiction,
-        j.dept_name
+        j.dept_name,
+        i.create_time
         FROM
         sys_information i
         LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
@@ -1834,6 +1841,12 @@
         <if test="stats!=null and stats!=''">
             and A.stats=#{stats}
         </if>
+        <if test="startTime!=null and startTime!=''">
+            and A.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime!=null and endTime!=''">
+            and A.create_time &lt;= #{endTime}
+        </if>
     </select>
 
     <!--保安人员详情-->

--
Gitblit v1.9.3