From 60dddbf3d0182c8a5220b04d3ea207b0756bc0f3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:15 +0800
Subject: [PATCH] 1.统计

---
 src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml |  550 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 365 insertions(+), 185 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 dbf5d29..ee3d86d 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -347,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>
@@ -602,6 +683,7 @@
     <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
@@ -624,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>
@@ -635,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>
@@ -767,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}

--
Gitblit v1.9.3