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 | 239 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 159 insertions(+), 80 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 c5d8228..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}
@@ -142,49 +172,71 @@
<!--资格审查异常数量-->
<select id="selectExtype" resultType="java.util.HashMap">
- SELECT IFNULL(A.num,0) AS zc,IFNULL(B.num ,0) AS bzc
- FROM (
- SELECT COUNT(*) AS num,
- u.dept_id,u.jurisdiction
- FROM blade_user u
- WHERE u.examination_type = 0
- GROUP BY u.dept_id,u.jurisdiction
- ) A
- LEFT JOIN (
- SELECT COUNT(*) AS num,
- u.dept_id,u.jurisdiction
- FROM blade_user u
- WHERE u.examination_type = 1
- GROUP BY u.dept_id,u.jurisdiction
- ) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
- WHERE A.jurisdiction = #{jurisdiction}
+ SELECT
+ IFNULL( A.num, 0 ) AS zc,
+ 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 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 where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and H.jurisdiction = #{jurisdiction}
</if>
- <if test="deptid!=null and deptid==''">
- WHERE A.dept_id = #{deptid}
+ <if test="deptid!=null and deptid!=''">
+ and H.departmentid = #{deptid}
</if>
</select>
<!--保安员持证和未持证数量-->
<select id="selectHold" resultType="java.util.HashMap">
- SELECT IFNULL(A.thisnum, 0) AS cz,
- IFNULL(B.lastnum, 0) AS wcz
- FROM (SELECT COUNT(*) AS thisnum, dept_id,jurisdiction
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ SELECT
+ IFNULL( A.thisnum, 0 ) AS cz,
+ IFNULL( B.lastnum, 0 ) AS wcz
+ FROM
+ (
+ SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
+ ) H
+ LEFT JOIN(
+ SELECT
+ COUNT( * ) AS thisnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586'
+ AND `status` = 1
+ AND is_deleted = 0
AND hold = 1
- GROUP BY dept_id,jurisdiction) A
- LEFT JOIN (SELECT COUNT(*) AS lastnum, dept_id,jurisdiction
- FROM blade_user
- WHERE role_id = '1412226235153731586' AND `status`=1 AND is_deleted=0
+ GROUP BY
+ dept_id
+ ) A ON A.dept_id=H.departmentid
+ LEFT JOIN (
+ SELECT
+ COUNT(*) AS lastnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586'
+ AND `status` = 1
+ AND is_deleted = 0
AND hold = 2
- GROUP BY dept_id,jurisdiction) B ON A.dept_id = B.dept_id
- <if test="jurisdiction!=null and jurisdiction==''">
- WHERE A.jurisdiction = #{jurisdiction}
+ GROUP BY
+ dept_id
+ ) B ON B.dept_id=H.departmentid
+ where 1=1
+ <if test="deptid!=null and deptid!=''">
+ and H.departmentid = #{deptid}
</if>
- <if test="deptid!=null and deptid==''">
- WHERE A.dept_id = #{deptid}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and H.jurisdiction = #{jurisdiction}
</if>
</select>
<!--派遣服务单位统计-->
@@ -198,20 +250,65 @@
</select>
<select id="selectDisp" resultType="java.util.HashMap">
- SELECT COUNT(d.NAME) AS num,
- u.real_name
- FROM sys_dispatcher d
- LEFT JOIN blade_user u ON u.cardid = d.cardid
- WHERE d.dept_id = #{deptid}
- GROUP BY u.real_name
+ SELECT
+ IFNULL( A.thisnum, 0 ) AS pnum,
+ IFNULL( B.lastnum, 0 ) AS wpnum
+ FROM
+ ( SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction ) H
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS thisnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ role_id = '1412226235153731586'
+ and `status` = 1
+ AND is_deleted = 0
+ AND dispatch = 0
+ GROUP BY
+ dept_id
+ ) A ON A.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT
+ COUNT( * ) AS lastnum,
+ dept_id
+ FROM
+ blade_user
+ WHERE
+ 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!='1372091709474910209'">
+ and H.jurisdiction = #{jurisdiction}
+ </if>
+ <if test="deptid!=null and deptid!=''">
+ and H.departmentid = #{deptid}
+ </if>
</select>
<select id="selectSoil" resultType="java.util.HashMap">
- SELECT A.numj,
- B.numz
- FROM (SELECT COUNT(*) AS numj, deptid FROM sys_socil GROUP BY deptid) A
- LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user GROUP BY dept_id) B ON A.deptid = B.dept_id
- WHERE A.deptid = #{deptid}
+ SELECT IFNULL(A.numj, 0) as numj,
+ 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 AND role_id = '1412226235153731586'
+ GROUP BY dept_id) A ON A.dept_id = H.departmentid
+ 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!='1372091709474910209'">
+ and H.jurisdiction = #{jurisdiction}
+ </if>
</select>
<!--查询培训单位信息(可以报名)-->
@@ -225,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>
@@ -240,35 +337,17 @@
</if>
</select>
- <!--查询本年所有月份的客户数量-->
+ <!--查询本年所有月份h合同开始时间的客户数量-->
<select id="queryYearKh" resultType="java.util.HashMap">
- SELECT COUNT
- (CASE WHEN MONTH (
- s.start_time ) = 1 THEN s.id END ) AS '1', COUNT(CASE WHEN MONTH ( s.start_time ) = 2
- THEN s.id END ) AS '2', COUNT(CASE WHEN MONTH ( s.start_time ) = 3 THEN s.id
- END ) AS '3', COUNT(CASE WHEN MONTH ( s.start_time ) = 4 THEN s.id END ) AS '4', COUNT(CASE
- WHEN MONTH ( s.start_time ) = 5 THEN s.id END ) AS '5', COUNT(CASE WHEN MONTH (
- s.start_time ) = 6 THEN s.id END ) AS '6', COUNT(CASE WHEN MONTH ( s.start_time ) = 7
- THEN s.id END ) AS '7', COUNT(CASE WHEN MONTH ( s.start_time ) = 8 THEN s.id
- END ) AS '8', COUNT(CASE WHEN MONTH ( s.start_time ) = 9 THEN s.id END ) AS '9', COUNT(CASE
- WHEN MONTH ( s.start_time ) = 10 THEN s.id END ) AS '10', COUNT(CASE WHEN MONTH (
- s.start_time ) = 11 THEN s.id END ) AS '11', COUNT(CASE WHEN MONTH ( s.start_time ) = 12
- THEN s.id END ) AS '12'
- FROM sys_dispatcher_unit AS s
- WHERE
- YEAR ( s.start_time ) =#{year}
- AND dept_id IN (
SELECT
- i.departmentid
+ start_time,
+ end_time
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}
+ `sys_dispatcher_unit`
+ WHERE YEAR (end_time) >='2021'
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and jurisdiction =#{jurisdiction}
</if>
- GROUP BY
- i.departmentid
- )
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
--
Gitblit v1.9.3