From 331c6391ade50d77db967bcba45de8b4b97342f6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 13 Nov 2021 14:54:24 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 86 ++++++++++++++++++++++---------------------
1 files changed, 44 insertions(+), 42 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..f5d00b7 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -51,11 +51,11 @@
on
sj.id = i.jurisdiction
LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
+ status=1 and is_deleted = 0 GROUP BY dept_id ) A ON A.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS cnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 AND hold=1 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
+ status=1 AND hold=1 and is_deleted = 0 GROUP BY dept_id ) B ON B.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) AS pnum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' AND
- status=1 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+ status=1 AND dispatch=0 and is_deleted = 0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
where 1=1
<if test="information.enterprisename!=null and information.enterprisename!=''">
and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
@@ -433,7 +433,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,7 +446,7 @@
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
@@ -458,7 +458,7 @@
blade_user
WHERE
STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) I ON I.dept_id = H.departmentid
@@ -472,7 +472,7 @@
DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
AND dispatch = 0
AND STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) G ON G.dept_id = H.departmentid
@@ -486,7 +486,7 @@
PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1
AND dispatch = 0
AND STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) J ON J.dept_id = H.departmentid
@@ -498,7 +498,7 @@
blade_user
WHERE dispatch = 0
AND STATUS = 1
- AND is_deleted = 0
+ AND is_deleted = 0 AND role_id='1412226235153731586'
GROUP BY
dept_id
) P ON P.dept_id = H.departmentid
@@ -694,7 +694,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,7 +704,7 @@
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 (
SELECT
@@ -751,7 +751,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 +766,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
@@ -818,7 +818,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 +833,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
@@ -1056,17 +1056,17 @@
<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 +1084,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 +1121,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
@@ -1802,6 +1803,7 @@
(
SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586'
and status=1
+ and is_deleted = 0
GROUP BY dept_id
) C
ON A.departmentid = C.dept_id
--
Gitblit v1.9.3