From 48679fc5bb7e8dc8b8d45a5d2373bd11dc612413 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Nov 2021 10:02:27 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 863 +++++++++++++++++++++++++++------------------------------
1 files changed, 409 insertions(+), 454 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 ee0dc67..7a68e7b 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -40,23 +40,83 @@
<select id="selectInformationPage" resultMap="informationResultMap">
SELECT
i.*,
- IFNULL(A.znum ,0) as znum,
- IFNULL(B.cnum ,0) as cnum,
- IFNULL(C.pnum ,0) as pnum,
+ IFNULL( A.znum, 0 ) AS znum,
+ IFNULL( B.cnum, 0 ) AS cnum,
+ 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
- status=1 AND hold=1 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
- where 1=1
+ LEFT JOIN sys_jurisdiction sj ON sj.id = i.jurisdiction
+ LEFT JOIN (
+ SELECT
+ J.znum + J.fznum AS znum,
+ J.dept_id
+ FROM
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
+ ) 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
+ 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
+ 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}),'%')
</if>
@@ -190,161 +250,6 @@
group by jurisdiction
</select>
- <!-- <!–统计上个月和这个月交社保的人数以及缴纳金额–>-->
- <!-- <select id="selectTo" resultType="java.util.HashMap">-->
- <!-- SELECT IFNULL(A.lastmonth, 0) AS lastmonth,-->
- <!-- IFNULL(B.thismouth, 0) AS thismouth,-->
- <!-- IFNULL(A.amount, 0) AS lastamount,-->
- <!-- IFNULL(B.amount, 0) AS thisamount,-->
- <!-- IFNULL( C.userthismouth, 0 ) AS userthismouth,-->
- <!-- IFNULL( D.userlastmouth, 0 ) AS userlastmouth,-->
- <!-- IFNULL( E.userpcthismouth, 0 ) AS userpcthismouth,-->
- <!-- IFNULL( F.userpclastmouth, 0 ) AS userpclastmouth-->
- <!-- FROM (-->
- <!-- SELECT COUNT(*) AS lastmonth,-->
- <!-- amount,-->
- <!-- deptid-->
- <!-- FROM-->
- <!-- sys_socil-->
- <!-- WHERE-->
- <!-- deptid IN ( SELECT i.departmentid FROM sys_information i LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY i.departmentid )-->
- <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and deptid =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- amount,-->
- <!-- deptid-->
- <!-- ) A-->
- <!-- left JOIN (-->
- <!-- SELECT COUNT(*) AS thismouth,-->
- <!-- amount,-->
- <!-- deptid-->
- <!-- FROM-->
- <!-- sys_socil-->
- <!-- WHERE-->
- <!-- deptid IN ( SELECT i.departmentid FROM sys_information i LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY i.departmentid )-->
- <!-- AND DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and deptid =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- amount,-->
- <!-- deptid-->
- <!-- ) B ON A.deptid = B.deptid-->
- <!-- LEFT JOIN (-->
- <!-- SELECT COUNT(*) AS userthismouth,-->
- <!-- dept_id-->
- <!-- FROM-->
- <!-- blade_user-->
- <!-- WHERE-->
- <!-- dept_id IN (-->
- <!-- SELECT-->
- <!-- i.departmentid-->
- <!-- FROM-->
- <!-- sys_information i-->
- <!-- LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- i.departmentid-->
- <!-- )-->
- <!-- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND status=1-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and dept_id =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- dept_id-->
- <!-- ) C ON C.dept_id = A.deptid-->
- <!-- LEFT JOIN(-->
- <!-- SELECT COUNT(*) AS userlastmouth,-->
- <!-- dept_id-->
- <!-- FROM-->
- <!-- blade_user-->
- <!-- WHERE-->
- <!-- dept_id IN (-->
- <!-- SELECT-->
- <!-- i.departmentid-->
- <!-- FROM-->
- <!-- sys_information i-->
- <!-- LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- i.departmentid-->
- <!-- )-->
- <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND status=1-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and dept_id =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- dept_id-->
- <!-- ) D ON D.dept_id = A.deptid-->
- <!-- LEFT JOIN (-->
- <!-- SELECT COUNT(*) AS userpcthismouth,-->
- <!-- dept_id-->
- <!-- FROM-->
- <!-- blade_user-->
- <!-- WHERE-->
- <!-- dept_id IN (-->
- <!-- SELECT-->
- <!-- i.departmentid-->
- <!-- FROM-->
- <!-- sys_information i-->
- <!-- LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- i.departmentid-->
- <!-- )-->
- <!-- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND dispatch=0-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and dept_id =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- dept_id-->
- <!-- ) E ON E.dept_id = A.deptid-->
- <!-- LEFT JOIN(-->
- <!-- SELECT COUNT(*) AS userpclastmouth,dept_id-->
- <!-- FROM-->
- <!-- blade_user-->
- <!-- WHERE-->
- <!-- dept_id IN (-->
- <!-- SELECT i.departmentid-->
- <!-- FROM-->
- <!-- sys_information i-->
- <!-- LEFT JOIN sys_jurisdiction j ON j.id = i.jurisdiction-->
- <!-- where 1=1-->
- <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
- <!-- and i.jurisdiction =#{jurisdiction}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- i.departmentid-->
- <!-- )-->
- <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND dispatch=0-->
- <!-- <if test="deptid!=null and deptid!=''">-->
- <!-- and dept_id =#{deptid}-->
- <!-- </if>-->
- <!-- GROUP BY-->
- <!-- dept_id-->
- <!-- ) F ON F.dept_id = A.deptid-->
- <!-- </select> -->
<!--统计上个月和这个月交社保的人数以及缴纳金额-->
<select id="selectTo" resultType="java.util.HashMap">
SELECT
@@ -433,7 +338,7 @@
WHERE
DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
AND STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) E ON E.dept_id = H.departmentid
@@ -446,33 +351,58 @@
WHERE
PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1
AND STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) F ON F.dept_id = H.departmentid
LEFT JOIN (
SELECT
- COUNT(*) AS usernum,
- dept_id
+ J.znum+J.fznum as usernum,
+ J.dept_id
FROM
- blade_user
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
WHERE
- STATUS = 1
- AND is_deleted = 0
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
GROUP BY
- dept_id
- ) I ON I.dept_id = H.departmentid
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J) I ON I.dept_id = H.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS userpcthismouth,
dept_id
FROM
- blade_user
+ sys_dispatcher
WHERE
- DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
- AND dispatch = 0
- AND STATUS = 1
- AND is_deleted = 0
+ DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ AND STATUS = 0
GROUP BY
dept_id
) G ON G.dept_id = H.departmentid
@@ -481,12 +411,10 @@
COUNT( * ) AS userpclastmouth,
dept_id
FROM
- blade_user
+ sys_dispatcher
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
+ PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1
+ AND STATUS = 0
GROUP BY
dept_id
) J ON J.dept_id = H.departmentid
@@ -495,16 +423,16 @@
COUNT(*) AS userpcnum,
dept_id
FROM
- blade_user
- WHERE dispatch = 0
- AND STATUS = 1
- AND is_deleted = 0
+ sys_dispatcher
+ WHERE STATUS = 0
GROUP BY
dept_id
) P ON P.dept_id = H.departmentid
+ 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 H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
@@ -626,67 +554,15 @@
</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,
+ IFNULL( C.fznum, 0 ) AS fznum,
H.departmentid,
H.jurisdiction
- FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ FROM (SELECT departmentid, jurisdiction FROM sys_information WHERE stats!=1 GROUP BY departmentid, jurisdiction)
+ H
LEFT JOIN (
SELECT COUNT(*) AS thisnum,
dept_id
@@ -694,7 +570,7 @@
WHERE role_id = '1412226235153731586'
AND STATUS = 1
AND is_deleted = 0
- AND DATE_FORMAT(create_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ AND DATE_FORMAT(rtime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
GROUP BY dept_id
) A ON A.dept_id = H.departmentid
LEFT JOIN (
@@ -704,24 +580,54 @@
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
+ AND PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(rtime, '%Y%m')) = 1
GROUP BY dept_id
- ) B ON B.dept_id = H.departmentid LEFT JOIN (
+ ) B ON B.dept_id = H.departmentid
+ LEFT JOIN (
SELECT
- COUNT( * ) AS num,
- dept_id
+ J.fznum,
+ J.znum+J.fznum as num,
+ J.dept_id
FROM
- blade_user
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
WHERE
- role_id = '1412226235153731586'
- AND STATUS = 1
- AND is_deleted = 0
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
GROUP BY
- dept_id
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
) C ON C.dept_id = H.departmentid
- where 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
+ WHERE 1 =1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
@@ -751,7 +657,7 @@
AND STATUS = 1
AND is_deleted = 0
AND examination_type = 0
- AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ AND DATE_FORMAT( rtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY
dept_id
) A ON H.departmentid = A.dept_id
@@ -766,7 +672,7 @@
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
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( rtime, '%Y%m' ) ) = 1
GROUP BY
dept_id
) B ON H.departmentid = B.dept_id
@@ -788,7 +694,7 @@
LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
WHERE 1 =1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
@@ -803,10 +709,11 @@
IFNULL( C.num, 0 ) AS num,
H.departmentid,
H.jurisdiction,
- d.dept_name AS deptname,
+ H.enterpriseName AS deptname,
j.dept_name AS jurname
FROM
- ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+ ( SELECT departmentid, jurisdiction,enterpriseName FROM sys_information GROUP BY departmentid,
+ jurisdiction,enterpriseName ) H
LEFT JOIN (
SELECT
COUNT(*) AS thisnum,
@@ -818,7 +725,7 @@
AND STATUS = 1
AND is_deleted = 0
AND hold = 1
- AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ AND DATE_FORMAT( rtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY
dept_id
) A ON H.departmentid = A.dept_id
@@ -833,7 +740,7 @@
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
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( rtime, '%Y%m' ) ) = 1
GROUP BY
dept_id
) B ON H.departmentid = B.dept_id
@@ -851,11 +758,10 @@
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 H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
@@ -909,10 +815,10 @@
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 (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
- and C.deptid =#{deptid}
+ and H.departmentid =#{deptid}
</if>
</select>
@@ -961,7 +867,7 @@
LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
WHERE 1 =1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
@@ -978,95 +884,64 @@
( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
LEFT JOIN (
SELECT
- SUM(num) AS thisnum,
+ COUNT(*) AS thisnum,
dept_id
FROM
sys_dispatcher
WHERE
DATE_FORMAT( dispatcherTime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
+ AND `status`=0
GROUP BY
dept_id
) G ON G.dept_id = H.departmentid
LEFT JOIN (
SELECT
- SUM(num) AS lastnum,
+ COUNT(*) AS lastnum,
dept_id
FROM
sys_dispatcher
WHERE
PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( dispatcherTime, '%Y%m' ) ) = 1
+ AND `status`=0
GROUP BY
dept_id
) J ON J.dept_id = H.departmentid
LEFT JOIN (
SELECT
- SUM(num) AS num,
+ COUNT(*) AS num,
dept_id
FROM
sys_dispatcher
+ where `status`=0
GROUP BY
dept_id
) C ON C.dept_id = H.departmentid
+ LEFT JOIN sys_jurisdiction j ON j.id = H.jurisdiction
WHERE 1 = 1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
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="queryYearZ" resultType="java.util.HashMap">
SELECT COUNT
(CASE WHEN MONTH (
- s.create_time ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.create_time ) = 2 THEN s.role_id END
- ) AS '2', COUNT(CASE WHEN MONTH ( s.create_time ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
- s.create_time ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.create_time ) = 5 THEN s.role_id END
- ) AS '5', COUNT(CASE WHEN MONTH ( s.create_time ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
- s.create_time ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.create_time ) = 8 THEN s.role_id END
- ) AS '8', COUNT(CASE WHEN MONTH ( s.create_time ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
- s.create_time ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.create_time ) = 11 THEN s.role_id
- END ) AS '11', COUNT(CASE WHEN MONTH ( s.create_time ) = 12 THEN s.role_id END ) AS '12'
+ s.rtime ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.rtime ) = 2 THEN s.role_id END
+ ) AS '2', COUNT(CASE WHEN MONTH ( s.rtime ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
+ s.create_time ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.rtime ) = 5 THEN s.role_id END
+ ) AS '5', COUNT(CASE WHEN MONTH ( s.rtime ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.rtime ) = 8 THEN s.role_id END
+ ) AS '8', COUNT(CASE WHEN MONTH ( s.rtime ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.rtime ) = 11 THEN s.role_id
+ END ) AS '11', COUNT(CASE WHEN MONTH ( s.rtime ) = 12 THEN s.role_id END ) AS '12'
FROM blade_user AS s
WHERE
- YEAR ( s.create_time ) =#{year}
+ YEAR ( s.rtime ) =#{year}
AND dept_id IN (
SELECT
i.departmentid
@@ -1084,21 +959,22 @@
and dept_id =#{deptid}
</if>
</select>
+
<!--查询本年所有月份的正常保安人数-->
<select id="queryYearZc" resultType="java.util.HashMap">
SELECT COUNT
(CASE WHEN MONTH (
- s.create_time ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.create_time ) = 2 THEN s.role_id END
- ) AS '2', COUNT(CASE WHEN MONTH ( s.create_time ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
- s.create_time ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.create_time ) = 5 THEN s.role_id END
- ) AS '5', COUNT(CASE WHEN MONTH ( s.create_time ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
- s.create_time ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.create_time ) = 8 THEN s.role_id END
- ) AS '8', COUNT(CASE WHEN MONTH ( s.create_time ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
- s.create_time ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.create_time ) = 11 THEN s.role_id
- END ) AS '11', COUNT(CASE WHEN MONTH ( s.create_time ) = 12 THEN s.role_id END ) AS '12'
+ s.rtime ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.rtime ) = 2 THEN s.role_id END
+ ) AS '2', COUNT(CASE WHEN MONTH ( s.rtime ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.rtime ) = 5 THEN s.role_id END
+ ) AS '5', COUNT(CASE WHEN MONTH ( s.rtime ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.rtime ) = 8 THEN s.role_id END
+ ) AS '8', COUNT(CASE WHEN MONTH ( s.rtime ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.rtime ) = 11 THEN s.role_id
+ END ) AS '11', COUNT(CASE WHEN MONTH ( s.rtime ) = 12 THEN s.role_id END ) AS '12'
FROM blade_user AS s
WHERE
- YEAR ( s.create_time ) =#{year}
+ YEAR ( s.rtime ) =#{year}
AND dept_id IN (
SELECT
i.departmentid
@@ -1120,17 +996,17 @@
<select id="queryYearCz" resultType="java.util.HashMap">
SELECT COUNT
(CASE WHEN MONTH (
- s.create_time ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.create_time ) = 2 THEN s.role_id END
- ) AS '2', COUNT(CASE WHEN MONTH ( s.create_time ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
- s.create_time ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.create_time ) = 5 THEN s.role_id END
- ) AS '5', COUNT(CASE WHEN MONTH ( s.create_time ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
- s.create_time ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.create_time ) = 8 THEN s.role_id END
- ) AS '8', COUNT(CASE WHEN MONTH ( s.create_time ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
- s.create_time ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.create_time ) = 11 THEN s.role_id
- END ) AS '11', COUNT(CASE WHEN MONTH ( s.create_time ) = 12 THEN s.role_id END ) AS '12'
+ s.rtime ) = 1 THEN s.role_id END ) AS '1', COUNT(CASE WHEN MONTH ( s.rtime ) = 2 THEN s.role_id END
+ ) AS '2', COUNT(CASE WHEN MONTH ( s.rtime ) = 3 THEN s.role_id END ) AS '3', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 4 THEN s.role_id END ) AS '4', COUNT(CASE WHEN MONTH ( s.rtime ) = 5 THEN s.role_id END
+ ) AS '5', COUNT(CASE WHEN MONTH ( s.rtime ) = 6 THEN s.role_id END ) AS '6', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 7 THEN s.role_id END ) AS '7', COUNT(CASE WHEN MONTH ( s.rtime ) = 8 THEN s.role_id END
+ ) AS '8', COUNT(CASE WHEN MONTH ( s.rtime ) = 9 THEN s.role_id END ) AS '9', COUNT(CASE WHEN MONTH (
+ s.rtime ) = 10 THEN s.role_id END ) AS '10', COUNT(CASE WHEN MONTH ( s.rtime ) = 11 THEN s.role_id
+ END ) AS '11', COUNT(CASE WHEN MONTH ( s.rtime ) = 12 THEN s.role_id END ) AS '12'
FROM blade_user AS s
WHERE
- YEAR ( s.create_time ) =#{year}
+ YEAR ( s.rtime ) =#{year}
AND dept_id IN (
SELECT
i.departmentid
@@ -1202,7 +1078,7 @@
i.departmentid
FROM
sys_information i
- LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1
+ LEFT JOIN sys_jurisdiction j ON j.id= i.jurisdiction where 1=1 and s.status=0
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
@@ -1247,55 +1123,8 @@
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( J.num, 0 ) AS num
@@ -1307,7 +1136,7 @@
u.dept_id
FROM
sys_performance p
- INNER JOIN blade_user u ON p.securityId = u.id WHERE 1=1
+ INNER JOIN blade_user u ON p.cardid = u.cardid WHERE 1=1
<if test="type!=null and type=='1'.toString()">
and to_days(p.time) = to_days(now())
</if>
@@ -1317,9 +1146,11 @@
GROUP BY
dept_id
) J ON J.dept_id = H.departmentid
- WHERE 1 = 1
+ 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 H.jurisdiction in(${jurisdiction})
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
AND H.departmentid = #{deptid}
@@ -1415,7 +1246,7 @@
<select id="selectLi" resultType="java.util.HashMap">
SELECT
- IFNULL( J.num, 0 ) AS num,
+ IFNULL( V.num, 0 ) AS num,
IFNULL( B.cznum, 0 ) AS cznum,
IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
IFNULL( E.sbnum, 0 ) AS sbnum,
@@ -1428,20 +1259,47 @@
A.stats,
j.dept_name AS jurname
FROM
- ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
+ ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information where stats !=1) A
LEFT JOIN (
SELECT
- COUNT( * ) AS num,
- dept_id
+ J.znum+J.fznum as num,
+ J.dept_id
FROM
- blade_user
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
WHERE
- role_id = '1412226235153731586'
- AND STATUS = 1
- AND is_deleted = 0
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
GROUP BY
- dept_id
- ) J ON J.dept_id = A.departmentid
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
+ ) V ON V.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS cznum,
@@ -1541,9 +1399,11 @@
GROUP BY
dept_id
) G ON G.dept_id = A.departmentid
- LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction WHERE 1=1
+ LEFT JOIN blade_dept d ON A.departmentid = d.id
+ 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}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and A.enterpriseName like concat(concat('%', #{deptid}),'%')
@@ -1571,7 +1431,9 @@
GROUP BY stats
</select>
<select id="seCountUm" resultType="java.lang.String">
- SELECT COUNT(*) as mnum FROM `blade_user` WHERE status=1 AND sex=1
+ SELECT COUNT(*) as mnum FROM `blade_user` WHERE status=1 and
+ role_id = '1412226235153731586'
+ and is_deleted = 0 AND sex='1'
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
@@ -1580,7 +1442,8 @@
</if>
</select>
<select id="seCountUg" resultType="java.lang.String">
- SELECT COUNT(*) as gnum FROM `blade_user` WHERE status=1 AND sex=2
+ SELECT COUNT(*) as gnum FROM `blade_user` WHERE status=1 and role_id = '1412226235153731586' and is_deleted = 0
+ AND sex='2'
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
@@ -1769,7 +1632,7 @@
A.departmentid,
A.stats,
A.jurisdiction,
- A.dept_name as jurname,
+ j.dept_name as jurname,
IFNULL( B.num, 0 ) AS fwnum,
IFNULL( C.znum, 0 ) AS znum,
IFNULL( D.dqnum, 0 ) AS dqnum,
@@ -1777,19 +1640,8 @@
IFNULL( F.pqnum, 0 ) AS pqnum
FROM
(
- SELECT
- i.enterpriseName,
- i.departmentid,
- i.stats,
- i.jurisdiction,
- j.dept_name,
- i.create_time
- FROM
- sys_information i
- LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
- WHERE
- i.enterpriseName IS NOT NULL
- ) A
+ SELECT enterpriseName,jurisdiction, departmentid,stats FROM sys_information WHERE stats!=1 GROUP BY
+ enterpriseName,jurisdiction,departmentid,stats) A
LEFT JOIN
(
SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit
@@ -1800,9 +1652,44 @@
ON A.departmentid = B.dept_id
LEFT JOIN
(
- SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'
- and status=1
- GROUP BY dept_id
+ SELECT
+ J.znum+J.fznum as znum,
+ J.dept_id
+ FROM
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
) C
ON A.departmentid = C.dept_id
LEFT JOIN
@@ -1822,18 +1709,20 @@
ON A.departmentid = E.dept_id
LEFT JOIN
(
- 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
+ SELECT
+ SUM(num) AS pqnum,
+ dept_id
+ FROM
+ sys_dispatcher
+ GROUP BY
+ dept_id
) F
ON A.departmentid = F.dept_id
- where 1=1
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
- AND A.jurisdiction in(${jurisdiction})
+ LEFT JOIN blade_dept d ON A.departmentid = d.id
+ LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
+ WHERE 1 =1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and A.enterpriseName like concat('%', #{deptid},'%')
@@ -1956,7 +1845,7 @@
u.jurisdiction,
j.dept_name AS jurname
FROM sys_information u
- LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction WHERE u.stats!=0
+ LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction WHERE u.stats!=1
) A
LEFT JOIN (
SELECT COUNT(*) AS cznum,
@@ -1976,11 +1865,44 @@
AND is_deleted = 0
GROUP BY dept_id
) C ON C.dept_id = A.departmentid
- 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 = A.departmentid where 1=1
+ LEFT JOIN (SELECT
+ J.znum+J.fznum as znum,
+ J.dept_id
+ FROM
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J )D ON D.dept_id = A.departmentid where 1=1
<if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
and A.jurisdiction in(${jurisdiction})
</if>
@@ -2040,7 +1962,7 @@
AND is_deleted = 0
GROUP BY
dept_id
- ) E ON E.dept_id = i.departmentid where 1=1 AND i.stats!=0
+ ) E ON E.dept_id = i.departmentid where 1=1 AND i.stats!=1
<if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
and i.jurisdiction in(${jurisdiction})
</if>
@@ -2099,7 +2021,7 @@
dept_id
) D ON D.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) fwnum, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) E ON i.departmentid =
- E.dept_id WHERE 1 =1 AND i.stats!=0
+ E.dept_id WHERE 1 =1 AND i.stats!=1
<if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
and i.jurisdiction in(${jurisdiction})
</if>
@@ -3116,28 +3038,61 @@
<select id="seleP" resultType="java.util.HashMap">
SELECT
IFNULL(G.pnum, 0) AS pnum,
- IFNULL(J.wpnum, 0) AS wpnum
+ IFNULL(K.wpnum, 0) AS wpnum
FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
LEFT JOIN (
SELECT COUNT(*) AS pnum,
dept_id
- FROM blade_user
- WHERE dispatch = 0
- AND STATUS = 1
- AND is_deleted = 0
+ FROM sys_dispatcher
+ WHERE STATUS = 0
GROUP BY dept_id
) G ON G.dept_id = H.departmentid
LEFT JOIN (
- SELECT COUNT(*) AS wpnum,
- dept_id
- FROM blade_user
- WHERE dispatch = 1
- AND STATUS = 1
- AND is_deleted = 0
- GROUP BY dept_id
- ) J ON J.dept_id = H.departmentid where 1=1
+ SELECT
+ J.znum+J.fznum as wpnum,
+ J.dept_id
+ FROM
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.dispatch = 1
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.dispatch = 1
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
+ ) K ON K.dept_id = H.departmentid
+ 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 H.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid =#{deptid}
--
Gitblit v1.9.3