From 2cdfc2901063cf4e7133091e2f82a89d41f3f50d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 09 Nov 2021 19:21:23 +0800
Subject: [PATCH] 1.统计

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 1119 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 718 insertions(+), 401 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 6e41400..ee0dc67 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -28,6 +28,7 @@
         <result column="contactscell" property="contactscell"/>
         <result column="business_License" property="businessLicense"/>
         <result column="licence" property="licence"/>
+        <result column="jurisdictionName" property="jurisdictionName"/>
         <result column="znum" property="znum"/>
         <result column="cnum" property="cnum"/>
         <result column="pnum" property="pnum"/>
@@ -41,9 +42,14 @@
         i.*,
         IFNULL(A.znum ,0) as znum,
         IFNULL(B.cnum ,0) as cnum,
-        IFNULL(C.pnum ,0) as pnum
+        IFNULL(C.pnum ,0) as pnum,
+        sj.dept_name jurisdictionName
         FROM
         sys_information i
+        left join
+        sys_jurisdiction sj
+        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
         LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
@@ -341,81 +347,162 @@
     <!--    </select> -->
     <!--统计上个月和这个月交社保的人数以及缴纳金额-->
     <select id="selectTo" resultType="java.util.HashMap">
-        SELECT IFNULL(A.lastmonth, 0) AS lastmonth,
-        IFNULL(B.thismouth, 0) AS thismouth,
-        IFNULL(C.thisamount, 0) AS thisamount,
-        IFNULL(D.lastamount, 0) AS lastamount,
-        IFNULL(E.userthismouth, 0) AS userthismouth,
-        IFNULL(F.userlastmouth, 0) AS userlastmouth,
-        IFNULL(G.userpcthismouth, 0) AS userpcthismouth,
-        IFNULL(J.userpclastmouth, 0) AS userpclastmouth
-        FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+        SELECT
+        IFNULL( A.lastmonth, 0 ) AS lastmonth,
+        IFNULL( B.thismouth, 0 ) AS thismouth,
+        IFNULL( Z.num, 0 ) AS num,
+        IFNULL( C.thisamount, 0 ) AS thisamount,
+        IFNULL( D.lastamount, 0 ) AS lastamount,
+        IFNULL( R.amountnum, 0 ) AS amountnum,
+        IFNULL( E.userthismouth, 0 ) AS userthismouth,
+        IFNULL( F.userlastmouth, 0 ) AS userlastmouth,
+        IFNULL( I.usernum, 0 ) AS usernum,
+        IFNULL( G.userpcthismouth, 0 ) AS userpcthismouth,
+        IFNULL( J.userpclastmouth, 0 ) AS userpclastmouth,
+        IFNULL( P.userpcnum, 0 ) AS userpcnum
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
         LEFT JOIN (
-        SELECT COUNT(*) AS lastmonth,
+        SELECT
+        COUNT( * ) AS lastmonth,
         deptid
-        FROM sys_socil
-        WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(insuredtime, '%Y%m')) = 1
-        GROUP BY deptid
+        FROM
+        sys_socil
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
+        GROUP BY
+        deptid
         ) A ON A.deptid = H.departmentid
         LEFT JOIN (
-        SELECT COUNT(*) AS thismouth,
+        SELECT
+        COUNT( * ) AS thismouth,
         deptid
-        FROM sys_socil
-        WHERE DATE_FORMAT(insuredtime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
-        GROUP BY deptid
+        FROM
+        sys_socil
+        WHERE
+        DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+        GROUP BY
+        deptid
         ) B ON B.deptid = H.departmentid
         LEFT JOIN (
-        SELECT SUM(amount) AS thisamount,
+        SELECT
+        COUNT( * ) AS num,
         deptid
-        FROM sys_socil
-        WHERE DATE_FORMAT(insuredtime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
-        GROUP BY deptid
+        FROM
+        sys_socil
+        GROUP BY
+        deptid
+        ) Z ON Z.deptid = H.departmentid
+        LEFT JOIN (
+        SELECT
+        SUM( amount ) AS thisamount,
+        deptid
+        FROM
+        sys_socil
+        WHERE
+        DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+        GROUP BY
+        deptid
         ) C ON C.deptid = H.departmentid
         LEFT JOIN (
-        SELECT SUM(amount) AS lastamount,
+        SELECT
+        SUM( amount ) AS lastamount,
         deptid
-        FROM sys_socil
-        WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(insuredtime, '%Y%m')) = 1
-        GROUP BY deptid
+        FROM
+        sys_socil
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
+        GROUP BY
+        deptid
         ) D ON D.deptid = H.departmentid
         LEFT JOIN (
-        SELECT COUNT(*) AS userthismouth,
+        SELECT
+        SUM(amount) AS amountnum,
+        deptid
+        FROM
+        sys_socil
+        GROUP BY
+        deptid
+        ) R ON R.deptid = H.departmentid
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS userthismouth,
         dept_id
-        FROM blade_user
-        WHERE DATE_FORMAT(update_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        FROM
+        blade_user
+        WHERE
+        DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
         AND STATUS = 1
         AND is_deleted = 0
-        GROUP BY dept_id
+        GROUP BY
+        dept_id
         ) E ON E.dept_id = H.departmentid
         LEFT JOIN (
-        SELECT COUNT(*) AS userlastmouth,
+        SELECT
+        COUNT( * ) AS userlastmouth,
         dept_id
-        FROM blade_user
-        WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(update_time, '%Y%m')) = 1
+        FROM
+        blade_user
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1
         AND STATUS = 1
         AND is_deleted = 0
-        GROUP BY dept_id
+        GROUP BY
+        dept_id
         ) F ON F.dept_id = H.departmentid
         LEFT JOIN (
-        SELECT COUNT(*) AS userpcthismouth,
+        SELECT
+        COUNT(*) AS usernum,
         dept_id
-        FROM blade_user
-        WHERE DATE_FORMAT(update_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+        FROM
+        blade_user
+        WHERE
+        STATUS = 1
+        AND is_deleted = 0
+        GROUP BY
+        dept_id
+        ) I ON I.dept_id = H.departmentid
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS userpcthismouth,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
         AND dispatch = 0
         AND STATUS = 1
         AND is_deleted = 0
-        GROUP BY dept_id
+        GROUP BY
+        dept_id
         ) G ON G.dept_id = H.departmentid
         LEFT JOIN (
-        SELECT COUNT(*) AS userpclastmouth,
+        SELECT
+        COUNT( * ) AS userpclastmouth,
         dept_id
-        FROM blade_user
-        WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(update_time, '%Y%m')) = 1
+        FROM
+        blade_user
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1
         AND dispatch = 0
         AND STATUS = 1
         AND is_deleted = 0
-        GROUP BY dept_id
-        ) J ON J.dept_id = H.departmentid where 1=1
+        GROUP BY
+        dept_id
+        ) J ON J.dept_id = H.departmentid
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS userpcnum,
+        dept_id
+        FROM
+        blade_user
+        WHERE dispatch = 0
+        AND STATUS = 1
+        AND is_deleted = 0
+        GROUP BY
+        dept_id
+        ) P ON P.dept_id = H.departmentid
+        WHERE 1 =1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and H.jurisdiction =#{jurisdiction}
         </if>
@@ -540,62 +627,63 @@
 
 
     <!--总保安数量-->
-<!--    <select id="queryCountB" resultType="java.util.HashMap">-->
-<!--        SELECT-->
-<!--        C.thisnum,-->
-<!--        C.lastnum,-->
-<!--        d.dept_name AS deptname,-->
-<!--        j.dept_name AS jurname-->
-<!--        FROM-->
-<!--        (-->
-<!--        SELECT-->
-<!--        IFNULL( A.thisnum, 0 ) AS thisnum,-->
-<!--        IFNULL( B.lastnum, 0 ) AS lastnum,-->
-<!--        A.dept_id,-->
-<!--        A.jurisdiction-->
-<!--        FROM-->
-<!--        (-->
-<!--        SELECT-->
-<!--        COUNT( * ) AS thisnum,-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        FROM-->
-<!--        blade_user-->
-<!--        WHERE-->
-<!--        role_id = '1412226235153731586' and status=1 and is_deleted=0-->
-<!--        AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
-<!--        GROUP BY-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        ) A-->
-<!--        LEFT JOIN (-->
-<!--        SELECT-->
-<!--        COUNT( * ) AS lastnum,-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        FROM-->
-<!--        blade_user-->
-<!--        WHERE-->
-<!--        role_id = '1412226235153731586' and status=1 and is_deleted=0-->
-<!--        AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1-->
-<!--        GROUP BY-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        ) B ON A.dept_id = B.dept_id-->
-<!--        ) C-->
-<!--        LEFT JOIN blade_dept d ON C.dept_id = d.id-->
-<!--        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction-->
-<!--        WHERE 1 =1-->
-<!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
-<!--            and C.jurisdiction =#{jurisdiction}-->
-<!--        </if>-->
-<!--        <if test="deptid!=null and deptid!=''">-->
-<!--            and C.dept_id =#{deptid}-->
-<!--        </if>-->
-<!--    </select>-->
+    <!--    <select id="queryCountB" resultType="java.util.HashMap">-->
+    <!--        SELECT-->
+    <!--        C.thisnum,-->
+    <!--        C.lastnum,-->
+    <!--        d.dept_name AS deptname,-->
+    <!--        j.dept_name AS jurname-->
+    <!--        FROM-->
+    <!--        (-->
+    <!--        SELECT-->
+    <!--        IFNULL( A.thisnum, 0 ) AS thisnum,-->
+    <!--        IFNULL( B.lastnum, 0 ) AS lastnum,-->
+    <!--        A.dept_id,-->
+    <!--        A.jurisdiction-->
+    <!--        FROM-->
+    <!--        (-->
+    <!--        SELECT-->
+    <!--        COUNT( * ) AS thisnum,-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        FROM-->
+    <!--        blade_user-->
+    <!--        WHERE-->
+    <!--        role_id = '1412226235153731586' and status=1 and is_deleted=0-->
+    <!--        AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
+    <!--        GROUP BY-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        ) A-->
+    <!--        LEFT JOIN (-->
+    <!--        SELECT-->
+    <!--        COUNT( * ) AS lastnum,-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        FROM-->
+    <!--        blade_user-->
+    <!--        WHERE-->
+    <!--        role_id = '1412226235153731586' and status=1 and is_deleted=0-->
+    <!--        AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1-->
+    <!--        GROUP BY-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        ) B ON A.dept_id = B.dept_id-->
+    <!--        ) C-->
+    <!--        LEFT JOIN blade_dept d ON C.dept_id = d.id-->
+    <!--        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction-->
+    <!--        WHERE 1 =1-->
+    <!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+    <!--            and C.jurisdiction =#{jurisdiction}-->
+    <!--        </if>-->
+    <!--        <if test="deptid!=null and deptid!=''">-->
+    <!--            and C.dept_id =#{deptid}-->
+    <!--        </if>-->
+    <!--    </select>-->
     <select id="queryCountB" resultType="java.util.HashMap">
         SELECT IFNULL(A.thisnum, 0) AS thisnum,
         IFNULL(B.lastnum, 0) AS lastnum,
+        IFNULL( C.num, 0 ) AS num,
         H.departmentid,
         H.jurisdiction
         FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
@@ -618,7 +706,20 @@
         AND is_deleted = 0
         AND PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(create_time, '%Y%m')) = 1
         GROUP BY dept_id
-        ) B ON B.dept_id = H.departmentid where 1=1
+        ) B ON B.dept_id = H.departmentid LEFT JOIN (
+        SELECT
+        COUNT( * ) AS num,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        GROUP BY
+        dept_id
+        ) C ON C.dept_id = H.departmentid
+        where 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and H.jurisdiction =#{jurisdiction}
         </if>
@@ -629,128 +730,184 @@
 
     <!--正常保安数量-->
     <select id="queryCountZc" resultType="java.util.HashMap">
-        SELECT C.thisnum,
-        C.lastnum,
-        d.dept_name as deptname,
-        j.dept_name as jurname
-        FROM (
-        SELECT IFNULL(A.thisnum, 0) AS thisnum,
-        IFNULL(B.lastnum, 0) AS lastnum,
-        A.dept_id,
-        A.jurisdiction
-        FROM (
-        SELECT COUNT
-        (*) AS thisnum,
-        dept_id,
-        jurisdiction
-        FROM blade_user
-        WHERE role_id = '1412226235153731586' and status=1 and is_deleted=0
+        SELECT
+        IFNULL( A.thisnum, 0 ) AS thisnum,
+        IFNULL( B.lastnum, 0 ) AS lastnum,
+        IFNULL( D.num, 0 ) AS num,
+        H.departmentid,
+        H.jurisdiction,
+        d.dept_name AS deptname,
+        j.dept_name AS jurname
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS thisnum,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
         AND examination_type = 0
         AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
-        GROUP BY dept_id,
-        jurisdiction
-        ) A
-        left JOIN (
-        SELECT COUNT
-        (*) AS lastnum,
-        dept_id,
-        jurisdiction
-        FROM blade_user
-        WHERE role_id = '1412226235153731586' and status=1 and is_deleted=0
+        GROUP BY
+        dept_id
+        ) A ON H.departmentid = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS lastnum,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
         AND examination_type = 0
         AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
-        GROUP BY dept_id,
-        jurisdiction
-        ) B ON A.dept_id = B.dept_id) C
-        LEFT JOIN blade_dept d ON C.dept_id = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
+        GROUP BY
+        dept_id
+        ) B ON H.departmentid = B.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS num,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND examination_type = 0
+        GROUP BY
+        dept_id
+        ) D ON H.departmentid = D.dept_id
+        LEFT JOIN blade_dept d ON H.departmentid = d.id
+        LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+        WHERE 1 =1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            and C.jurisdiction =#{jurisdiction}
+            and H.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
-            and C.dept_id =#{deptid}
+            and H.departmentid =#{deptid}
         </if>
     </select>
 
     <!--持证保安数量-->
     <select id="queryCountCz" resultType="java.util.HashMap">
-        SELECT C.thisnum,
-        C.lastnum,
-        d.dept_name as deptname,
-        j.dept_name as jurname
-        FROM (
-        SELECT IFNULL(A.thisnum, 0) AS thisnum,
-        IFNULL(B.lastnum, 0) AS lastnum,
-        A.dept_id,
-        A.jurisdiction
-        FROM (
-        SELECT COUNT
-        (*) AS thisnum,
-        dept_id,
-        jurisdiction
-        FROM blade_user
-        WHERE role_id = '1412226235153731586' and status=1 and is_deleted=0
+        SELECT
+        IFNULL( A.thisnum, 0 ) AS thisnum,
+        IFNULL( B.lastnum, 0 ) AS lastnum,
+        IFNULL( C.num, 0 ) AS num,
+        H.departmentid,
+        H.jurisdiction,
+        d.dept_name AS deptname,
+        j.dept_name AS jurname
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS thisnum,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
         AND hold = 1
         AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
-        GROUP BY dept_id,
-        jurisdiction
-        ) A
-        left JOIN (
-        SELECT COUNT
-        (*) AS lastnum,
-        dept_id,
-        jurisdiction
-        FROM blade_user
-        WHERE role_id = '1412226235153731586' and status=1 and is_deleted=0
+        GROUP BY
+        dept_id
+        ) A ON H.departmentid = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS lastnum,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
         AND hold = 1
         AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
-        GROUP BY dept_id,
-        jurisdiction
-        ) B ON A.dept_id = B.dept_id) C
-        LEFT JOIN blade_dept d ON C.dept_id = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
+        GROUP BY
+        dept_id
+        ) B ON H.departmentid = B.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS num,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND hold = 1
+        GROUP BY
+        dept_id
+        ) C ON H.departmentid = C.dept_id
+        LEFT JOIN blade_dept d ON H.departmentid = d.id
+        LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+        WHERE 1 =1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            and C.jurisdiction =#{jurisdiction}
+            and H.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
-            and C.dept_id =#{deptid}
+            and H.departmentid =#{deptid}
         </if>
     </select>
 
     <!--缴纳社保数量-->
     <select id="queryCountSb" resultType="java.util.HashMap">
-        SELECT C.thisnum,
-        C.lastnum,
+        SELECT
+        IFNULL( A.thisnum, 0 ) AS thisnum,
+        IFNULL( B.lastnum, 0 ) AS lastnum,
+        IFNULL( C.num, 0 ) AS num,
+        H.departmentid,
+        H.jurisdiction,
         d.dept_name AS deptname,
         j.dept_name AS jurname
-        FROM (
-        SELECT IFNULL(A.thisnum, 0) AS thisnum,
-        IFNULL(B.lastnum, 0) AS lastnum,
-        A.deptid,
-        A.jurisdiction
-        FROM (
-        SELECT COUNT
-        (*) AS thisnum,
-        deptid,
-        jurisdiction
-        FROM sys_socil
-        WHERE DATE_FORMAT(insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
-        GROUP BY deptid,
-        jurisdiction
-        ) A
-        left JOIN (
-        SELECT COUNT
-        (*) AS lastnum,
-        deptid,
-        jurisdiction
-        FROM sys_socil
-        WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
-        GROUP BY deptid,
-        jurisdiction
-        ) B ON A.deptid = B.deptid
-        ) C
-        LEFT JOIN blade_dept d ON C.deptid = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS thisnum,
+        deptid
+        FROM
+        sys_socil
+        WHERE
+        DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+        GROUP BY
+        deptid
+        ) A ON H.departmentid = A.deptid
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS lastnum,
+        deptid
+        FROM
+        sys_socil
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
+        GROUP BY
+        deptid
+        ) B ON H.departmentid = B.deptid
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS num,
+        deptid
+        FROM
+        sys_socil
+        GROUP BY
+        deptid
+        ) C ON H.departmentid = C.deptid
+        LEFT JOIN blade_dept d ON H.departmentid = d.id
+        LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+        WHERE 1 =1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and C.jurisdiction =#{jurisdiction}
         </if>
@@ -761,66 +918,95 @@
 
     <!--服务客户数量-->
     <select id="queryCountKh" resultType="java.util.HashMap">
-        SELECT C.thisnum,
-        C.lastnum,
-        C.dept_id,
-        d.dept_name AS deptname,
-        j.dept_name AS jurname
-        FROM (
-        SELECT IFNULL(A.thisnum, 0) AS thisnum,
-        IFNULL(B.lastnum, 0) AS lastnum,
-        A.dept_id,
-        A.jurisdiction
-        FROM (
-        SELECT COUNT
-        (*) AS thisnum,
-        dept_id,
-        jurisdiction
-        FROM sys_dispatcher_unit
-        WHERE DATE_FORMAT( start_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
-        GROUP BY dept_id,
-        jurisdiction
-        ) A
-        left JOIN (
-        SELECT COUNT
-        (*) AS lastnum,
-        dept_id,
-        jurisdiction
-        FROM sys_dispatcher_unit
-        WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( start_time, '%Y%m' ) ) = 1
-        GROUP BY dept_id,
-        jurisdiction
-        ) B ON A.dept_id = B.dept_id
-        ) C
-        LEFT JOIN blade_dept d ON C.dept_id = d.id
-        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction WHERE 1=1
+        SELECT
+        IFNULL( A.thisnum, 0 ) AS thisnum,
+        IFNULL( B.lastnum, 0 ) AS lastnum,
+        IFNULL( C.num, 0 ) AS num,
+        H.departmentid,
+        H.jurisdiction
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS thisnum,
+        dept_id
+        FROM
+        sys_dispatcher_unit
+        WHERE
+        DATE_FORMAT( start_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+        GROUP BY
+        dept_id
+        ) A ON H.departmentid = A.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS lastnum,
+        dept_id
+        FROM
+        sys_dispatcher_unit
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( start_time, '%Y%m' ) ) = 1
+        GROUP BY
+        dept_id
+        ) B ON H.departmentid = B.dept_id
+        LEFT JOIN (
+        SELECT
+        COUNT(*) AS num,
+        dept_id
+        FROM
+        sys_dispatcher_unit
+        GROUP BY
+        dept_id
+        ) C ON H.departmentid = C.dept_id
+        LEFT JOIN blade_dept d ON H.departmentid = d.id
+        LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+        WHERE 1 =1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            and C.jurisdiction =#{jurisdiction}
+            and H.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
-            and C.dept_id =#{deptid}
+            and H.departmentid =#{deptid}
         </if>
     </select>
 
     <!--保安派遣数量-->
     <select id="queryCountPq" resultType="java.util.HashMap">
-        SELECT IFNULL(G.thisnum, 0) AS thisnum,
-        IFNULL(J.lastnum, 0) AS lastnum
-        FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+        SELECT
+        IFNULL( G.thisnum, 0 ) AS thisnum,
+        IFNULL( J.lastnum, 0 ) AS lastnum,
+        IFNULL( C.num, 0 ) AS num
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
         LEFT JOIN (
-        SELECT SUM(num) AS thisnum,
+        SELECT
+        SUM(num) AS thisnum,
         dept_id
-        FROM sys_dispatcher
-        WHERE DATE_FORMAT(dispatcherTime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
-        GROUP BY dept_id
+        FROM
+        sys_dispatcher
+        WHERE
+        DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+        GROUP BY
+        dept_id
         ) G ON G.dept_id = H.departmentid
         LEFT JOIN (
-        SELECT SUM(num) AS lastnum,
+        SELECT
+        SUM(num) AS lastnum,
         dept_id
-        FROM sys_dispatcher
-        WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(dispatcherTime, '%Y%m')) = 1
-        GROUP BY dept_id
+        FROM
+        sys_dispatcher
+        WHERE
+        PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1
+        GROUP BY
+        dept_id
         ) J ON J.dept_id = H.departmentid
+        LEFT JOIN (
+        SELECT
+        SUM(num) AS num,
+        dept_id
+        FROM
+        sys_dispatcher
+        GROUP BY
+        dept_id
+        ) C ON C.dept_id = H.departmentid
         WHERE 1 = 1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and H.jurisdiction =#{jurisdiction}
@@ -829,41 +1015,41 @@
             and H.departmentid =#{deptid}
         </if>
     </select>
-<!--    <select id="queryCountPq" resultType="java.util.HashMap">-->
-<!--        SELECT C.thisnum,-->
-<!--        C.lastnum,-->
-<!--        d.dept_name as deptname,-->
-<!--        j.dept_name as jurname-->
-<!--        FROM (-->
-<!--        SELECT IFNULL(A.thisnum, 0) AS thisnum,-->
-<!--        IFNULL(B.lastnum, 0) AS lastnum,-->
-<!--        A.dept_id,-->
-<!--        A.jurisdiction-->
-<!--        FROM (-->
-<!--        SELECT SUM(num) AS thisnum,-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        FROM sys_dispatcher-->
-<!--        WHERE DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
-<!--        GROUP BY dept_id, jurisdiction-->
-<!--        ) A-->
-<!--        left JOIN (-->
-<!--        SELECT SUM(num) AS lastnum,-->
-<!--        dept_id,-->
-<!--        jurisdiction-->
-<!--        FROM sys_dispatcher-->
-<!--        WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1-->
-<!--        GROUP BY dept_id, jurisdiction-->
-<!--        ) B ON A.dept_id = B.dept_id) C-->
-<!--        LEFT JOIN blade_dept d ON C.dept_id = d.id-->
-<!--        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1-->
-<!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
-<!--            and C.jurisdiction =#{jurisdiction}-->
-<!--        </if>-->
-<!--        <if test="deptid!=null and deptid!=''">-->
-<!--            and C.dept_id =#{deptid}-->
-<!--        </if>-->
-<!--    </select>-->
+    <!--    <select id="queryCountPq" resultType="java.util.HashMap">-->
+    <!--        SELECT C.thisnum,-->
+    <!--        C.lastnum,-->
+    <!--        d.dept_name as deptname,-->
+    <!--        j.dept_name as jurname-->
+    <!--        FROM (-->
+    <!--        SELECT IFNULL(A.thisnum, 0) AS thisnum,-->
+    <!--        IFNULL(B.lastnum, 0) AS lastnum,-->
+    <!--        A.dept_id,-->
+    <!--        A.jurisdiction-->
+    <!--        FROM (-->
+    <!--        SELECT SUM(num) AS thisnum,-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        FROM sys_dispatcher-->
+    <!--        WHERE DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
+    <!--        GROUP BY dept_id, jurisdiction-->
+    <!--        ) A-->
+    <!--        left JOIN (-->
+    <!--        SELECT SUM(num) AS lastnum,-->
+    <!--        dept_id,-->
+    <!--        jurisdiction-->
+    <!--        FROM sys_dispatcher-->
+    <!--        WHERE PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1-->
+    <!--        GROUP BY dept_id, jurisdiction-->
+    <!--        ) B ON A.dept_id = B.dept_id) C-->
+    <!--        LEFT JOIN blade_dept d ON C.dept_id = d.id-->
+    <!--        LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1-->
+    <!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+    <!--            and C.jurisdiction =#{jurisdiction}-->
+    <!--        </if>-->
+    <!--        <if test="deptid!=null and deptid!=''">-->
+    <!--            and C.dept_id =#{deptid}-->
+    <!--        </if>-->
+    <!--    </select>-->
 
 
     <!--查询本年所有月份的总人数-->
@@ -1030,63 +1216,123 @@
 
     <!--资格审查异常数量-->
     <select id="selectExtype" resultType="java.util.HashMap">
-        SELECT COUNT
-        (*) as num,
-        d.dept_name,
-        u.real_name,
-        j.dept_name AS jurname
-        FROM blade_user u
-        LEFT JOIN blade_dept d ON d.id = u.dept_id
-        LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
-        WHERE u.examination_type = 1 and u.is_deleted=0 and u.status = 1
-        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            and u.jurisdiction in (${jurisdiction})
-        </if>
-        <if test="deptid!=null and deptid!=''">
-            and u.dept_id =#{deptid}
-        </if>
+        SELECT
+        IFNULL( J.num, 0 ) AS num
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        INNER JOIN (
+        SELECT
+        COUNT( * ) AS num,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        examination_type = 1
+        AND is_deleted = 0
+        AND STATUS = 1
         <if test="type!=null and type=='1'.toString()">
-            and to_days(u.update_time) = to_days(now())
+            and to_days(audit_time) = to_days(now())
         </if>
         <if test="type!=null and type=='2'.toString()">
-            and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+            and DATE_FORMAT(audit_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         </if>
-        GROUP BY d.dept_name,u.real_name,
-        j.dept_name
+        GROUP BY
+        dept_id
+        ) J ON J.dept_id = H.departmentid
+        WHERE 1 = 1
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+            AND H.jurisdiction in(${jurisdiction})
+        </if>
+        <if test="deptid!=null and deptid!=''">
+            AND H.departmentid = #{deptid}
+        </if>
     </select>
+    <!--    <select id="selectExtype" resultType="java.util.HashMap">-->
+    <!--        SELECT COUNT-->
+    <!--        (*) as num,-->
+    <!--        d.dept_name,-->
+    <!--        u.real_name,-->
+    <!--        j.dept_name AS jurname-->
+    <!--        FROM blade_user u-->
+    <!--        LEFT JOIN blade_dept d ON d.id = u.dept_id-->
+    <!--        LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction-->
+    <!--        WHERE u.examination_type = 1 and u.is_deleted=0 and u.status = 1-->
+    <!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+    <!--            and u.jurisdiction in (${jurisdiction})-->
+    <!--        </if>-->
+    <!--        <if test="deptid!=null and deptid!=''">-->
+    <!--            and u.dept_id =#{deptid}-->
+    <!--        </if>-->
+    <!--        <if test="type!=null and type=='1'.toString()">-->
+    <!--            and to_days(u.update_time) = to_days(now())-->
+    <!--        </if>-->
+    <!--        <if test="type!=null and type=='2'.toString()">-->
+    <!--            and DATE_FORMAT(u.update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )-->
+    <!--        </if>-->
+    <!--        GROUP BY d.dept_name,u.real_name,-->
+    <!--        j.dept_name-->
+    <!--    </select>-->
     <!--表现差的数量-->
+    <!--    <select id="selectBx" resultType="java.util.HashMap">-->
+    <!--        SELECT IFNULL(COUNT( * ),0) AS num,-->
+    <!--        d.dept_name,-->
+    <!--        j.dept_name AS jurname-->
+    <!--        FROM sys_performance u-->
+    <!--        LEFT JOIN blade_dept d ON d.id = u.departmentid-->
+    <!--        LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction-->
+    <!--        WHERE score = 3-->
+    <!--        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
+    <!--            and u.jurisdiction in(${jurisdiction})-->
+    <!--        </if>-->
+    <!--        <if test="deptid!=null and deptid!=''">-->
+    <!--            and u.departmentid =#{deptid}-->
+    <!--        </if>-->
+    <!--        <if test="type!=null and type=='1'.toString()">-->
+    <!--            and to_days(u.time) = to_days(now())-->
+    <!--        </if>-->
+    <!--        <if test="type!=null and type=='2'.toString()">-->
+    <!--            and DATE_FORMAT(u.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )-->
+    <!--        </if>-->
+    <!--        GROUP BY d.dept_name,-->
+    <!--        j.dept_name-->
+    <!--    </select>-->
     <select id="selectBx" resultType="java.util.HashMap">
-        SELECT IFNULL(COUNT( * ),0) AS num,
-        d.dept_name,
-        j.dept_name AS jurname
-        FROM sys_performance u
-        LEFT JOIN blade_dept d ON d.id = u.departmentid
-        LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
-        WHERE score = 3
-        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
-            and u.jurisdiction in(${jurisdiction})
-        </if>
-        <if test="deptid!=null and deptid!=''">
-            and u.departmentid =#{deptid}
-        </if>
+        SELECT
+        IFNULL( J.num, 0 ) AS num
+        FROM
+        ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+        LEFT JOIN (
+        SELECT
+        IFNULL( COUNT( * ), 0 ) AS num,
+        u.dept_id
+        FROM
+        sys_performance p
+        INNER JOIN blade_user u ON p.securityId = u.id WHERE 1=1
         <if test="type!=null and type=='1'.toString()">
-            and to_days(u.time) = to_days(now())
+            and to_days(p.time) = to_days(now())
         </if>
         <if test="type!=null and type=='2'.toString()">
-            and DATE_FORMAT(u.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
+            and DATE_FORMAT(p.time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )
         </if>
-        GROUP BY d.dept_name,
-        j.dept_name
+        GROUP BY
+        dept_id
+        ) J ON J.dept_id = H.departmentid
+        WHERE 1 = 1
+        <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+            AND H.jurisdiction in(${jurisdiction})
+        </if>
+        <if test="deptid!=null and deptid!=''">
+            AND H.departmentid = #{deptid}
+        </if>
     </select>
 
 
     <select id="selectBxs" resultType="java.util.HashMap">
-        select
-            si.jurisdiction id,
-            sj.parent_id,
-            sj.dept_name jurisdictionName,
-            si.enterprisename,
-            "表现差" detail
+        select si.jurisdiction id,
+               sj.parent_id,
+               sj.dept_name    jurisdictionName,
+               si.enterprisename,
+               "表现差"           detail
         from sys_performance sp
                  left join
              blade_user bu
@@ -1100,9 +1346,8 @@
              sys_jurisdiction sj
              on
                  sj.id = si.jurisdiction
-        where
-            1=1
-          and (si.stats = 2 or si.stats =4)
+        where 1 = 1
+          and (si.stats = 2 or si.stats = 4)
           and bu.is_deleted = 0
           and bu.`status` = 1
           and sp.score = 3
@@ -1170,142 +1415,147 @@
 
     <select id="selectLi" resultType="java.util.HashMap">
         SELECT
-        IFNULL( A.num, 0 ) AS num,
+        IFNULL( J.num, 0 ) AS num,
         IFNULL( B.cznum, 0 ) AS cznum,
-        IFNULL( C.paiqnum, 0 ) AS paiqnum,
         IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
         IFNULL( E.sbnum, 0 ) AS sbnum,
         IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
         IFNULL( H.ycaijzpnum, 0 ) AS ycaijzpnum,
         IFNULL( I.ycaijzwnum, 0 ) AS ycaijzwnum,
         IFNULL( G.yicnum, 0 ) AS yicnum,
-        A.dept_id,
-        d.enterpriseName AS deptname,
-        d.stats,
+        A.departmentid,
+        A.enterpriseName AS deptname,
+        A.stats,
         j.dept_name AS jurname
         FROM
-        ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and
-        status=1 AND is_deleted=0 GROUP BY
-        dept_id, jurisdiction ) A
+        ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
+        LEFT JOIN (
+        SELECT
+        COUNT( * ) AS num,
+        dept_id
+        FROM
+        blade_user
+        WHERE
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        GROUP BY
+        dept_id
+        ) J ON J.dept_id = A.departmentid
         LEFT JOIN (
         SELECT
         COUNT( * ) AS cznum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND hold=1
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND hold = 1
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) B ON A.dept_id = B.dept_id
+        dept_id
+        ) B ON A.departmentid = B.dept_id
         LEFT JOIN (
         SELECT
         COUNT( * ) AS paiqnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND dispatch=0
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND dispatch = 0
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) C ON C.dept_id = A.dept_id
+        dept_id
+        ) C ON C.dept_id = A.departmentid
         LEFT JOIN (
         SELECT
         COUNT( * ) AS wpaiqnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND dispatch=1
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND dispatch = 1
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) D ON D.dept_id = A.dept_id
+        dept_id
+        ) D ON D.dept_id = A.departmentid
+        LEFT JOIN ( SELECT COUNT( * ) AS sbnum, deptid FROM sys_socil GROUP BY deptid ) E ON E.deptid = A.departmentid
         LEFT JOIN (
-        SELECT COUNT( * ) AS sbnum, deptid, jurisdiction FROM sys_socil GROUP BY deptid, jurisdiction
-        ) E
-        ON E.deptid = A.dept_id
-        LEFT JOIN
-        (
         SELECT
         COUNT( * ) AS wcaijnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND photo=1
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND photo = 1
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) F
-        ON F.dept_id = A.dept_id
-        LEFT JOIN
-        (
+        dept_id
+        ) F ON F.dept_id = A.departmentid
+        LEFT JOIN (
         SELECT
         COUNT( * ) AS ycaijzpnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND photo=0
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND photo = 0
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) H
-        ON H.dept_id = A.dept_id
-        LEFT JOIN
-        (
+        dept_id
+        ) H ON H.dept_id = A.departmentid
+        LEFT JOIN (
         SELECT
         COUNT( * ) AS ycaijzwnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND fingerprint=0
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND fingerprint = 0
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) I
-        ON I.dept_id = A.dept_id
+        dept_id
+        ) I ON I.dept_id = A.departmentid
         LEFT JOIN (
         SELECT
         COUNT( * ) AS yicnum,
-        dept_id,
-        jurisdiction
+        dept_id
         FROM
         blade_user
         WHERE
-        role_id = '1412226235153731586' and status=1 AND is_deleted=0
-        AND examination_mx=1
+        role_id = '1412226235153731586'
+        AND STATUS = 1
+        AND is_deleted = 0
+        AND examination_mx = 1
         GROUP BY
-        dept_id,
-        jurisdiction
-        ) G ON G.dept_id = A.dept_id
-        LEFT JOIN sys_information d ON A.dept_id = d.departmentid
-        LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
-        WHERE 1=1
+        dept_id
+        ) G ON G.dept_id = A.departmentid
+        LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction WHERE 1=1
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and A.jurisdiction =#{jurisdiction}
         </if>
         <if test="deptid!=null and deptid!=''">
-            and d.enterpriseName like concat(concat('%', #{deptid}),'%')
+            and A.enterpriseName like concat(concat('%', #{deptid}),'%')
         </if>
         <if test="stats!=null and stats!=''">
-            and d.stats =#{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>
 
@@ -1532,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
@@ -1561,12 +1812,23 @@
         ON A.departmentid = D.dept_id
         LEFT JOIN
         (
-        SELECT COUNT( * ) AS cznum, dept_id FROM blade_user where hold = 1 GROUP BY dept_id
+        SELECT COUNT( * ) AS cznum, dept_id FROM blade_user where
+        hold = 1
+        and role_id = '1412226235153731586'
+        and status= 1
+        and is_deleted = 0
+        GROUP BY dept_id
         ) E
         ON A.departmentid = E.dept_id
         LEFT JOIN
         (
-        SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user where dispatch = 0 GROUP BY dept_id
+        SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user
+        where
+        dispatch = 0
+        and role_id = '1412226235153731586'
+        and status= 1
+        and is_deleted = 0
+        GROUP BY dept_id
         ) F
         ON A.departmentid = F.dept_id
         where 1=1
@@ -1578,6 +1840,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>
 
@@ -2274,7 +2542,8 @@
         from
         (
         select d.dept_id,count(*) count from (
-        select a.dept_id, ifnull(b.count, 0) num1, ifnull(c.count, 0) num2,ifnull(FORMAT((c.count/b.count)*100, 2), 0) num3 from
+        select a.dept_id, ifnull(b.count, 0) num1, ifnull(c.count, 0) num2,ifnull(FORMAT((c.count/b.count)*100, 2), 0)
+        num3 from
         (
         select
         bu.dept_id, ifnull(count(*), 0) count
@@ -2580,7 +2849,7 @@
     <!--统计表现差的信息-->
     <select id="getSecurityPerformanceGroupCountList" resultType="org.springblade.modules.information.vo.ResponseVo">
         select a.id,
-               a.dept_name name,
+               a.dept_name        name,
                ifnull(b.count, 0) num
         from (select id, dept_name from sys_jurisdiction where parent_id = 1372091709474910209) a
                  left join
@@ -2611,7 +2880,7 @@
                  group by si.jurisdiction
              ) b
              on
-            a.id = b.parent_id
+                 a.id = b.parent_id
     </select>
 
 
@@ -2779,14 +3048,16 @@
 
 
     <!--持证率低于50%,社保缴纳率低于50%,派遣率低于50%-->
-    <select id="getSecurityHoldAndSoidAndDispatchGroupCountList" resultType="org.springblade.modules.information.vo.ResponseVo">
+    <select id="getSecurityHoldAndSoidAndDispatchGroupCountList"
+            resultType="org.springblade.modules.information.vo.ResponseVo">
         select g.id,g.dept_name name,ifnull(f.count,0) num
         from
         (select id,dept_name from sys_jurisdiction where parent_id = 1372091709474910209) g
         left join
         (
         select c.id,c.parent_id,count(*) count from (
-        select si.enterpriseName,sj.id,sj.parent_id,a.dept_id,ifnull(a.count,0) num1,ifnull(b.count,0) num2,ifnull(FORMAT((b.count/a.count)*100,2),0) num3 from
+        select si.enterpriseName,sj.id,sj.parent_id,a.dept_id,ifnull(a.count,0) num1,ifnull(b.count,0)
+        num2,ifnull(FORMAT((b.count/a.count)*100,2),0) num3 from
         (
         select
         bu.dept_id,ifnull(count(*),0) count
@@ -2873,4 +3144,50 @@
         </if>
     </select>
 
+
+    <select id="seleFj" resultType="java.util.HashMap">
+        SELECT i.departmentid,
+        i.enterpriseName,
+        IFNULL(D.znum, 0) AS znum,
+        IFNULL(d.num, 0) AS fwnum,
+        IFNULL(B.cznum, 0) AS cznum,
+        IFNULL(C.sbnum, 0) AS sbnum
+        FROM sys_information i
+        LEFT JOIN (
+        SELECT COUNT(*) AS znum,
+        dept_id
+        FROM blade_user
+        WHERE role_id = '1412226235153731586'
+        AND `status` = 1
+        AND is_deleted = 0
+        GROUP BY dept_id
+        ) D ON D.dept_id = i.departmentid
+        LEFT JOIN (SELECT COUNT(*) num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id) d
+        ON i.departmentid = d.dept_id
+        LEFT JOIN (
+        SELECT COUNT(*) AS cznum,
+        dept_id
+        FROM blade_user
+        WHERE hold = 1
+        AND role_id = '1412226235153731586'
+        AND `status` = 1
+        AND is_deleted = 0
+        GROUP BY dept_id
+        ) B ON B.dept_id = i.departmentid
+        LEFT JOIN (
+        SELECT COUNT(*) AS sbnum,
+        dept_id
+        FROM blade_user
+        WHERE soil = 0
+        AND role_id = '1412226235153731586'
+        AND `status` = 1
+        AND is_deleted = 0
+        GROUP BY dept_id
+        ) C ON C.dept_id = i.departmentid
+        WHERE 1 = 1
+        AND i.stats !=0
+        <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
+            and i.jurisdiction in(${jurisdiction})
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.3