From aab7aee0718488088a00271a8f12392b7cd86518 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 13 Nov 2021 14:01:03 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index ee3d86d..6652918 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
@@ -1220,7 +1220,7 @@
IFNULL( J.num, 0 ) AS num
FROM
( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN (
+ INNER JOIN (
SELECT
COUNT( * ) AS num,
dept_id
@@ -1428,7 +1428,7 @@
A.stats,
j.dept_name AS jurname
FROM
- ( SELECT jurisdiction, departmentid,enterpriseName,stats FROM sys_information ) A
+ ( SELECT jurisdiction, departmentid,enterpriseName,stats,create_time FROM sys_information ) A
LEFT JOIN (
SELECT
COUNT( * ) AS num,
@@ -1550,6 +1550,12 @@
</if>
<if test="stats!=null and stats!=''">
and A.stats =#{stats}
+ </if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
</if>
</select>
@@ -1776,7 +1782,8 @@
i.departmentid,
i.stats,
i.jurisdiction,
- j.dept_name
+ j.dept_name,
+ i.create_time
FROM
sys_information i
LEFT JOIN sys_jurisdiction j ON i.jurisdiction = j.id
@@ -1795,6 +1802,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
@@ -1834,6 +1842,12 @@
<if test="stats!=null and stats!=''">
and A.stats=#{stats}
</if>
+ <if test="startTime!=null and startTime!=''">
+ and A.create_time >= #{startTime}
+ </if>
+ <if test="endTime!=null and endTime!=''">
+ and A.create_time <= #{endTime}
+ </if>
</select>
<!--保安人员详情-->
--
Gitblit v1.9.3