From d3613119296b9542b7fa62a4cee10d04062c0a08 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 30 Jul 2021 15:05:02 +0800
Subject: [PATCH] 1.统计接口调整
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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 a38542b..994c724 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -127,17 +127,17 @@
left JOIN (
SELECT COUNT
(*) AS numz,
- deptid
- FROM sys_socil
- WHERE deptid IN (SELECT i.departmentid
+ 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!='1123598813738675201'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid)
- GROUP BY deptid
- ) B ON A.deptid = B.deptid
+ GROUP BY dept_id
+ ) B ON A.deptid = B.dept_id
LEFT JOIN (SELECT id, dept_name FROM blade_dept) d ON d.id = A.deptid where 1=1
<if test="deptid!=null and deptid!=''">
and A.deptid =#{deptid}
@@ -305,7 +305,7 @@
FROM
blade_user
WHERE
- role_id = '1413323482159321089'
+ role_id = '1412226235153731586'
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY
dept_id,
@@ -319,7 +319,7 @@
FROM
blade_user
WHERE
- role_id = '1413323482159321089'
+ role_id = '1412226235153731586'
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY
dept_id,
@@ -354,7 +354,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND examination_type = 0
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY dept_id,
@@ -366,7 +366,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND examination_type = 0
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY dept_id,
@@ -399,7 +399,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND hold = 0
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY dept_id,
@@ -411,7 +411,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1413323482159321089'
+ WHERE role_id = '1412226235153731586'
AND hold = 0
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY dept_id,
@@ -577,7 +577,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089'
+ AND role_id='1412226235153731586'
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -609,7 +609,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089' AND examination_type=0
+ AND role_id='1412226235153731586' AND examination_type=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -641,7 +641,7 @@
GROUP BY
i.departmentid
)
- AND role_id='1413323482159321089' AND hold=0
+ AND role_id='1412226235153731586' AND hold=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -721,7 +721,7 @@
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 = 2
+ WHERE u.examination_type = 1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
--
Gitblit v1.9.3