From df577d901e09267d2e2ef597d063e3d6f3454bff Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 25 Aug 2021 18:00:05 +0800
Subject: [PATCH] 用户审查接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 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 185feb4..f0402b2 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.information.mapper.InformationMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="informationResultMap" type="org.springblade.modules.information.entity.Information">
+ <resultMap id="informationResultMap" type="org.springblade.modules.information.vo.InformationVO">
<id column="id" property="id"/>
<result column="creditCode" property="creditcode"/>
<result column="enterpriseName" property="enterprisename"/>
@@ -28,6 +28,9 @@
<result column="contactscell" property="contactscell"/>
<result column="businessLicense" property="businessLicense"/>
<result column="licence" property="licence"/>
+ <result column="znum" property="znum"/>
+ <result column="cnum" property="cnum"/>
+ <result column="pnum" property="pnum"/>
<result column="fregion" property="fregion"/>
<result column="ftime" property="ftime"/>
</resultMap>
@@ -41,9 +44,9 @@
IFNULL(C.pnum ,0) as pnum
FROM
sys_information i
- LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' 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 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 is_deleted = 0 AND dispatch=0 GROUP BY dept_id ) C ON C.dept_id = i.departmentid
+ 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
+ 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
+ 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
where 1=1
<if test="information.enterprisename!=null and information.enterprisename!=''">
and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
@@ -461,7 +464,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND DATE_FORMAT( create_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
GROUP BY
dept_id,
@@ -475,7 +478,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) = 1
GROUP BY
dept_id,
@@ -878,7 +881,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 = 1 and u.is_deleted=0
+ WHERE u.examination_type = 1 and u.is_deleted=0 and u.status = 1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
and u.jurisdiction =#{jurisdiction}
</if>
@@ -992,7 +995,7 @@
d.dept_name AS deptname,
j.dept_name AS jurname
FROM
- ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+ ( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and status=1 GROUP BY
dept_id, jurisdiction ) A
LEFT JOIN (
SELECT
@@ -1002,7 +1005,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND hold=1
GROUP BY
dept_id,
@@ -1016,7 +1019,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND dispatch=0
GROUP BY
dept_id,
@@ -1030,7 +1033,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND dispatch=1
GROUP BY
dept_id,
@@ -1047,7 +1050,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND photo=1
GROUP BY
dept_id,
@@ -1061,7 +1064,7 @@
FROM
blade_user
WHERE
- role_id = '1412226235153731586'
+ role_id = '1412226235153731586' and status=1
AND examination_mx=1
GROUP BY
dept_id,
@@ -1134,14 +1137,14 @@
) A
LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
FROM blade_user
- WHERE role_id = '1412226235153731586'
+ WHERE role_id = '1412226235153731586' and status=1
GROUP BY dept_id, jurisdiction) B ON A.departmentid = B.dept_id
LEFT JOIN (
SELECT COUNT(*) AS zcnum,
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1412226235153731586'
+ WHERE role_id = '1412226235153731586' and status=1
AND examination_type = 0
GROUP BY dept_id,
jurisdiction
@@ -1151,7 +1154,7 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1412226235153731586'
+ WHERE role_id = '1412226235153731586' and status=1
AND hold = 1
GROUP BY dept_id,
jurisdiction
@@ -1215,14 +1218,14 @@
dept_id,
jurisdiction
FROM blade_user
- WHERE role_id = '1412226235153731586'
+ WHERE role_id = '1412226235153731586' and status=1
AND dispatch = 0
GROUP BY dept_id,
jurisdiction
) D ON A.departmentid = D.dept_id
LEFT JOIN (SELECT COUNT(*) AS znum, dept_id, jurisdiction
FROM blade_user
- WHERE role_id = '1412226235153731586'
+ WHERE role_id = '1412226235153731586' and status=1
GROUP BY dept_id, jurisdiction) E ON A.departmentid = E.dept_id) J
WHERE 1=1
<if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
@@ -1259,7 +1262,7 @@
) A
LEFT JOIN ( SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) B ON A.departmentid =
B.dept_id
- LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' GROUP BY
+ LEFT JOIN ( SELECT COUNT( * ) AS znum, dept_id FROM blade_user WHERE role_id = '1412226235153731586' and status=1 GROUP BY
dept_id ) C ON A.departmentid = C.dept_id
where 1=1
<if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
--
Gitblit v1.9.3