From 39e82fbf10b1062d37a127aac0629e79fc80654a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 25 Nov 2021 15:22:11 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 182 ++++++++++++++++++++++++++-------------------
1 files changed, 105 insertions(+), 77 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 afd0da7..dc026bf 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -45,11 +45,11 @@
FROM
sys_information i
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 is_deleted = 0 AND hold=1 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 is_deleted = 0 AND dispatch=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}),'%')
@@ -1204,142 +1204,170 @@
<select id="selectLi" resultType="java.util.HashMap">
SELECT
- IFNULL( A.num, 0 ) AS num,
+ IFNULL( V.num, 0 ) AS num,
IFNULL( B.cznum, 0 ) AS cznum,
- IFNULL( C.paiqnum, 0 ) AS paiqnum,
IFNULL( D.wpaiqnum, 0 ) AS wpaiqnum,
IFNULL( E.sbnum, 0 ) AS sbnum,
IFNULL( F.wcaijnum, 0 ) AS wcaijnum,
IFNULL( H.ycaijzpnum, 0 ) AS ycaijzpnum,
IFNULL( I.ycaijzwnum, 0 ) AS ycaijzwnum,
IFNULL( G.yicnum, 0 ) AS yicnum,
- A.dept_id,
- d.enterpriseName AS deptname,
- d.stats,
+ A.departmentid,
+ A.enterpriseName AS deptname,
+ A.stats,
j.dept_name AS jurname
FROM
- ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and
- status=1 AND is_deleted=0 GROUP BY
- dept_id, jurisdiction ) A
+ ( SELECT jurisdiction, departmentid,enterpriseName,stats FROM sys_information where stats !=1) A
+ LEFT JOIN (
+ SELECT
+ J.znum+J.fznum as num,
+ J.dept_id
+ FROM
+ (
+ SELECT
+ A.znum,
+ IFNULL( B.znum, 0 ) AS fznum,
+ A.dept_id
+ FROM
+ (
+ SELECT
+ COUNT( * ) AS znum,
+ bu.dept_id
+ FROM
+ blade_user bu
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bu.dept_id
+ ) A
+ LEFT JOIN (
+ SELECT
+ IFNULL( COUNT( * ), 0 ) AS znum,
+ bd.parent_id
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept bd ON bu.dept_id = bd.id
+ WHERE
+ bu.`status` = 1
+ AND bu.is_deleted = 0
+ AND bu.role_id = '1412226235153731586'
+ GROUP BY
+ bd.parent_id
+ ) B ON B.parent_id = A.dept_id
+ ) J
+ ) V ON V.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS cznum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND hold=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND hold = 1
GROUP BY
- dept_id,
- jurisdiction
- ) B ON A.dept_id = B.dept_id
+ dept_id
+ ) B ON A.departmentid = B.dept_id
LEFT JOIN (
SELECT
COUNT( * ) AS paiqnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND dispatch=0
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND dispatch = 0
GROUP BY
- dept_id,
- jurisdiction
- ) C ON C.dept_id = A.dept_id
+ dept_id
+ ) C ON C.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS wpaiqnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND dispatch=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND dispatch = 1
GROUP BY
- dept_id,
- jurisdiction
- ) D ON D.dept_id = A.dept_id
+ dept_id
+ ) D ON D.dept_id = A.departmentid
+ LEFT JOIN ( SELECT COUNT( * ) AS sbnum, deptid FROM sys_socil GROUP BY deptid ) E ON E.deptid = A.departmentid
LEFT JOIN (
- SELECT COUNT( * ) AS sbnum, deptid, jurisdiction FROM sys_socil GROUP BY deptid, jurisdiction
- ) E
- ON E.deptid = A.dept_id
- LEFT JOIN
- (
SELECT
COUNT( * ) AS wcaijnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND photo = 1
GROUP BY
- dept_id,
- jurisdiction
- ) F
- ON F.dept_id = A.dept_id
- LEFT JOIN
- (
+ dept_id
+ ) F ON F.dept_id = A.departmentid
+ LEFT JOIN (
SELECT
COUNT( * ) AS ycaijzpnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND photo=0
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND photo = 0
GROUP BY
- dept_id,
- jurisdiction
- ) H
- ON H.dept_id = A.dept_id
- LEFT JOIN
- (
+ dept_id
+ ) H ON H.dept_id = A.departmentid
+ LEFT JOIN (
SELECT
COUNT( * ) AS ycaijzwnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND fingerprint=0
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND fingerprint = 0
GROUP BY
- dept_id,
- jurisdiction
- ) I
- ON I.dept_id = A.dept_id
+ dept_id
+ ) I ON I.dept_id = A.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS yicnum,
- dept_id,
- jurisdiction
+ dept_id
FROM
blade_user
WHERE
- role_id = '1412226235153731586' and status=1 AND is_deleted=0
- AND examination_mx=1
+ role_id = '1412226235153731586'
+ AND STATUS = 1
+ AND is_deleted = 0
+ AND examination_mx = 1
GROUP BY
- dept_id,
- jurisdiction
- ) G ON G.dept_id = A.dept_id
- LEFT JOIN sys_information d ON A.dept_id = d.departmentid
+ dept_id
+ ) G ON G.dept_id = A.departmentid
+ LEFT JOIN blade_dept d ON A.departmentid = d.id
LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
- WHERE 1=1
+ WHERE 1 =1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and A.jurisdiction =#{jurisdiction}
+ and (j.id = #{jurisdiction} or j.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
- and d.enterpriseName like concat(concat('%', #{deptid}),'%')
+ and A.enterpriseName like concat(concat('%', #{deptid}),'%')
</if>
<if test="stats!=null and stats!=''">
- and d.stats =#{stats}
+ and A.stats =#{stats}
</if>
</select>
--
Gitblit v1.9.3