From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 88 +++++++++++++++++++++++++++++++-------------
1 files changed, 62 insertions(+), 26 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 98b7c58..224e874 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -27,7 +27,7 @@
<result column="representativecell" property="representativecell"/>
<result column="contacts" property="contacts"/>
<result column="contactscell" property="contactscell"/>
- <result column="businessLicense" property="businessLicense"/>
+ <result column="business_License" property="businessLicense"/>
<result column="licence" property="licence"/>
<result column="znum" property="znum"/>
<result column="cnum" property="cnum"/>
@@ -61,13 +61,46 @@
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
- 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
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS znum, dept_id FROM blade_user
+ WHERE 1=1
+ and role_id = '1412226235153731586'
+ and is_deleted = 0
+ 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 1=1
+ and role_id = '1412226235153731586'
+ and is_deleted = 0
+ 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 1=1
+ and is_deleted = 0
+ and role_id = '1412226235153731586'
+ AND status=1
+ AND dispatch=0
+ GROUP BY dept_id
+ ) C
+ ON C.dept_id = i.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = i.jurisdiction
where 1=1
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{information.jurisdiction} or sj.parent_id=#{information.jurisdiction})
+ </if>
<if test="information.enterprisename!=null and information.enterprisename!=''">
and i.enterpriseName like concat(concat('%', #{information.enterprisename}),'%')
</if>
@@ -76,9 +109,6 @@
</if>
<if test="information.stats!=null and information.stats!=''">
and i.stats=#{information.stats}
- </if>
- <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1123598813738675201'">
- and i.jurisdiction=#{information.jurisdiction}
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
and i.departmentid=#{information.departmentid}
@@ -148,11 +178,14 @@
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 GROUP BY u.dept_id
+ 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 GROUP BY u.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 where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -177,7 +210,7 @@
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 1
@@ -191,7 +224,7 @@
FROM
blade_user
WHERE
- ( role_id = '1412226235153731586' OR role_id = '1416733602219110402' )
+ role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
AND hold = 2
@@ -202,7 +235,7 @@
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
</select>
@@ -229,7 +262,8 @@
FROM
blade_user
WHERE
- `status` = 1
+ role_id = '1412226235153731586'
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 0
GROUP BY
@@ -242,13 +276,14 @@
FROM
blade_user
WHERE
- `status` = 1
+ role_id = '1412226235153731586'
+ and `status` = 1
AND is_deleted = 0
AND dispatch = 1
GROUP BY
dept_id
- ) B ON H.departmentid = B.dept_id where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ ) B ON H.departmentid = B.dept_id where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -258,19 +293,20 @@
<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!=''">
and H.departmentid = #{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and H.jurisdiction = #{jurisdiction}
</if>
</select>
@@ -286,7 +322,7 @@
on
si.departmentid = bd.id
where 1=1
- and bd.dept_category = 3
+ and si.stats = 1
<if test="information.deptName!=null and information.deptName!=''">
and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
</if>
@@ -309,7 +345,7 @@
FROM
`sys_dispatcher_unit`
WHERE YEAR (end_time) >='2021'
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
--
Gitblit v1.9.3