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 | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 a1d745d..6652918 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -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
--
Gitblit v1.9.3