From 47d788e075c8a4a38cb171a3ed78820aada74e8f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 24 Nov 2021 20:03:10 +0800
Subject: [PATCH] 1.主要管理人接口修改 2.出资人修改 3.用户查询修改，保安员审查查询修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 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 0833608..3638236 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -149,13 +149,26 @@
IFNULL( B.num, 0 ) AS bzc
FROM
(
- SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 0 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
- ) A ON H.departmentid = A.dept_id
- LEFT JOIN ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 1 or u.examination_type is null ) and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
- ) B ON H.departmentid = B.dept_id where 1=1
+ SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction
+ ) H
+ LEFT JOIN
+ ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE (u.examination_type = 0 or
+ u.examination_type is null) and role_id =
+ '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY u.dept_id
+ ) A
+ ON H.departmentid = A.dept_id
+ LEFT JOIN
+ ( SELECT COUNT(*) AS num, u.dept_id FROM blade_user u WHERE u.examination_type = 1 and role_id = '1412226235153731586' AND `status` = 1 AND is_deleted = 0 GROUP BY
+ u.dept_id
+ ) B
+ ON H.departmentid = B.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction = #{jurisdiction}
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
@@ -201,7 +214,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 2
@@ -259,7 +272,7 @@
AND dispatch = 1
GROUP BY
dept_id
- ) B ON H.departmentid = B.dept_id where 1=1
+ ) B ON H.departmentid = B.dept_id where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
@@ -270,13 +283,14 @@
<select id="selectSoil" resultType="java.util.HashMap">
SELECT IFNULL(A.numj, 0) as numj,
- IFNULL(B.numz, 0) as numz
+ IFNULL(B.numwj, 0) as numz
FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
LEFT JOIN (SELECT COUNT(*) AS numj, dept_id
FROM blade_user
- WHERE soil = 0 AND `status` = 1 AND is_deleted = 0
+ WHERE soil = 0 AND `status` = 1 AND is_deleted = 0 AND role_id = '1412226235153731586'
GROUP BY dept_id) A ON A.dept_id = H.departmentid
- LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user WHERE `status` = 1 AND is_deleted = 0 GROUP BY
+ LEFT JOIN (SELECT COUNT(*) AS numwj, dept_id FROM blade_user WHERE soil = 1 and `status` = 1 AND is_deleted = 0
+ AND role_id = '1412226235153731586' GROUP BY
dept_id) B
ON H.departmentid = B.dept_id where 1=1
<if test="deptid!=null and deptid!=''">
--
Gitblit v1.9.3