From a841e7d34df4edf9955da8e1db09ed8de079ad95 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Sep 2021 19:23:44 +0800
Subject: [PATCH] 1.现场检查新增字段 2.用户表新增是否缴纳保险字段 3.统计接口新增，修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 695 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 601 insertions(+), 94 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 f476ca9..f35fe24 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -26,7 +26,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"/>
@@ -60,7 +60,7 @@
<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'">
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
and i.jurisdiction=#{information.jurisdiction}
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
@@ -124,9 +124,9 @@
LEFT JOIN blade_dept d ON d.id= u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id= u.jurisdiction
WHERE
- hold = 2
+ u.hold = 2 and u.status=1
<if test="jurisdiction!=null and jurisdiction!=''">
- and u.jurisdiction =#{jurisdiction}
+ and u.jurisdiction in(${jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and u.dept_id =#{deptid}
@@ -149,8 +149,8 @@
WHERE deptid IN (SELECT i.departmentid
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}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and i.jurisdiction in(${jurisdiction})
</if>
GROUP BY i.departmentid)
GROUP BY deptid
@@ -163,8 +163,8 @@
WHERE dept_id IN (SELECT i.departmentid
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}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and i.jurisdiction in(${jurisdiction})
</if>
GROUP BY i.departmentid)
GROUP BY dept_id
@@ -194,7 +194,7 @@
<!-- WHERE-->
<!-- deptid IN ( SELECT i.departmentid 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY i.departmentid )-->
@@ -215,7 +215,7 @@
<!-- WHERE-->
<!-- deptid IN ( SELECT i.departmentid 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY i.departmentid )-->
@@ -240,7 +240,7 @@
<!-- 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY-->
@@ -266,7 +266,7 @@
<!-- 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY-->
@@ -292,7 +292,7 @@
<!-- 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY-->
@@ -316,7 +316,7 @@
<!-- 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'">-->
+ <!-- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">-->
<!-- and i.jurisdiction =#{jurisdiction}-->
<!-- </if>-->
<!-- GROUP BY-->
@@ -407,7 +407,7 @@
AND is_deleted = 0
GROUP BY dept_id
) J ON J.dept_id = H.departmentid 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!=''">
@@ -437,7 +437,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -467,7 +467,7 @@
AND is_deleted=0
AND dept_id IN ( SELECT i.departmentid 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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid )
@@ -496,7 +496,7 @@
YEAR ( s.dispatcherTime ) =#{year}
AND dept_id IN ( SELECT i.departmentid 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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid )
@@ -520,7 +520,7 @@
WHERE YEAR (s.insuredtime) =#{year}
AND deptid IN (SELECT i.departmentid 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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY i.departmentid )
@@ -577,7 +577,7 @@
LEFT JOIN blade_dept d ON C.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction
WHERE 1 =1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -622,7 +622,7 @@
) B ON A.dept_id = B.dept_id) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -667,7 +667,7 @@
) B ON A.dept_id = B.dept_id) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -709,7 +709,7 @@
) C
LEFT JOIN blade_dept d ON C.deptid = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -752,7 +752,7 @@
) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction WHERE 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -789,7 +789,7 @@
) B ON A.dept_id = B.dept_id) C
LEFT JOIN blade_dept d ON C.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = C.jurisdiction where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and C.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -819,7 +819,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -851,7 +851,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -883,7 +883,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -918,7 +918,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -949,7 +949,7 @@
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'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -971,8 +971,8 @@
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 and u.status = 1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and u.jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and u.jurisdiction in (${jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and u.dept_id =#{deptid}
@@ -995,8 +995,8 @@
LEFT JOIN blade_dept d ON d.id = u.departmentid
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
WHERE score = 3
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and u.jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and u.jurisdiction in(${jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and u.departmentid =#{deptid}
@@ -1011,12 +1011,12 @@
j.dept_name
</select>
- <!--查询出所有辖区信息-->
- <select id="selectJur" resultType="java.util.HashMap">
- SELECT id, dept_name
- FROM sys_jurisdiction
- WHERE id!=1123598813738675201
- </select>
+<!-- <!–查询出所有辖区信息–>-->
+<!-- <select id="selectJur" resultType="java.util.HashMap">-->
+<!-- SELECT id, dept_name-->
+<!-- FROM sys_jurisdiction-->
+<!-- WHERE id!=1372091709474910209-->
+<!-- </select> -->
<select id="selectExtypeUser" resultType="java.lang.Integer">
SELECT COUNT(CASE WHEN (examination_mx IS NOT NULL OR examination_mx != "") THEN 1 END) AS sum
@@ -1034,7 +1034,7 @@
LEFT JOIN blade_dept d ON d.id = u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
WHERE dispatch = 0
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and u.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -1049,7 +1049,7 @@
LEFT JOIN blade_dept d ON d.id = u.dept_id
LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
WHERE dispatch = 1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and u.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
@@ -1060,8 +1060,8 @@
<select id="selectIn" resultType="java.util.HashMap">
SELECT enterpriseName, departmentid
FROM sys_information where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and jurisdiction in(${jurisdiction})
</if>
</select>
<delete id="deleteDept">
@@ -1079,6 +1079,8 @@
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,
@@ -1132,21 +1134,56 @@
) D ON D.dept_id = A.dept_id
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
- FROM
- blade_user
- WHERE
- 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
+ ) E
+ ON E.deptid = A.dept_id
+ LEFT JOIN
+ (
+ SELECT
+ COUNT( * ) AS wcaijnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ 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
+ (
+ SELECT
+ COUNT( * ) AS ycaijzpnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ 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
+ (
+ SELECT
+ COUNT( * ) AS ycaijzwnum,
+ dept_id,
+ jurisdiction
+ FROM
+ blade_user
+ WHERE
+ 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
LEFT JOIN (
SELECT
COUNT( * ) AS yicnum,
@@ -1164,11 +1201,11 @@
LEFT JOIN sys_information d ON A.dept_id = d.departmentid
LEFT JOIN sys_jurisdiction j ON j.id = A.jurisdiction
WHERE 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and A.jurisdiction =#{jurisdiction}
</if>
<if test="deptid!=null and deptid!=''">
- and d.dept_name like concat(concat('%', #{deptid}),'%')
+ and d.enterpriseName like concat(concat('%', #{deptid}),'%')
</if>
<if test="stats!=null and stats!=''">
and d.stats =#{stats}
@@ -1181,7 +1218,7 @@
<if test="deptid!=null and deptid!=''">
and departmentid=#{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
AND jurisdiction=#{jurisdiction}
</if>
GROUP BY stats
@@ -1191,7 +1228,7 @@
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
AND jurisdiction=#{jurisdiction}
</if>
</select>
@@ -1200,7 +1237,7 @@
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
AND jurisdiction=#{jurisdiction}
</if>
</select>
@@ -1314,8 +1351,8 @@
) G ON A.departmentid = G.dept_id
) J
WHERE 1=1
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
- and J.jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
+ and J.jurisdiction in(${jurisdiction})
</if>
<if test="enterpriseName!=null and enterpriseName!=''">
and J.enterpriseName like concat('%', #{enterpriseName},'%')
@@ -1368,8 +1405,8 @@
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'">
- and J.jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
+ and J.jurisdiction in(${jurisdiction})
</if>
<if test="enterpriseName!=null and enterpriseName!=''">
and J.enterpriseName like concat('%', #{enterpriseName},'%')
@@ -1387,7 +1424,10 @@
A.jurisdiction,
A.dept_name as jurname,
IFNULL( B.num, 0 ) AS fwnum,
- IFNULL( C.znum, 0 ) AS znum
+ IFNULL( C.znum, 0 ) AS znum,
+ IFNULL( D.dqnum, 0 ) AS dqnum,
+ IFNULL( E.cznum, 0 ) AS cznum,
+ IFNULL( F.pqnum, 0 ) AS pqnum
FROM
(
SELECT
@@ -1402,14 +1442,39 @@
WHERE
i.enterpriseName IS NOT NULL
) 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' and
- status=1 GROUP BY
- dept_id ) C ON A.departmentid = C.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS num, dept_id FROM sys_dispatcher_unit
+ where
+ start_time <= now() and end_time > now()
+ 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'
+ and status=1
+ GROUP BY dept_id
+ ) C
+ ON A.departmentid = C.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS dqnum, dept_id FROM sys_dispatcher_unit where end_time < now() GROUP BY dept_id
+ ) D
+ ON A.departmentid = D.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS cznum, dept_id FROM blade_user where hold = 1 GROUP BY dept_id
+ ) E
+ ON A.departmentid = E.dept_id
+ LEFT JOIN
+ (
+ SELECT COUNT( * ) AS pqnum, dept_id FROM blade_user where dispatch = 0 GROUP BY dept_id
+ ) F
+ ON A.departmentid = F.dept_id
where 1=1
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
- AND A.jurisdiction=#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
+ AND A.jurisdiction in(${jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and A.enterpriseName like concat('%', #{deptid},'%')
@@ -1474,7 +1539,7 @@
LEFT JOIN sys_dispatcher_unit u ON u.id = di.dispatcher_unit_id
LEFT JOIN sys_jurisdiction j ON j.id = di.jurisdiction where 1=1
and di.dept_id=#{deptid}
- <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!=''and jurisdiction!='1372091709474910209'">
and di.jurisdiction =#{jurisdiction}
</if>
<if test="fid!=null and fid!=''">
@@ -1492,8 +1557,8 @@
SELECT COUNT(*) AS num,
deptid
FROM `sys_punish` where 1=1
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
- and jurisdiction =#{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and jurisdiction in(${jurisdiction})
</if>
GROUP BY deptid
</select>
@@ -1507,7 +1572,7 @@
FROM
sys_information i
LEFT JOIN sys_jurisdiction j ON j.id=i.jurisdiction WHERE i.creditCode is NULL
- <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
and i.jurisdiction =#{jurisdiction}
</if>
GROUP BY
@@ -1524,11 +1589,9 @@
SELECT u.enterpriseName,
u.departmentid,
u.jurisdiction,
- d.dept_name AS deptname,
j.dept_name AS jurname
FROM sys_information u
- LEFT JOIN blade_dept d ON d.id = u.departmentid
- LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction
+ LEFT JOIN sys_jurisdiction j ON j.id = u.jurisdiction WHERE u.stats!=0
) A
LEFT JOIN (
SELECT COUNT(*) AS cznum,
@@ -1553,8 +1616,8 @@
WHERE role_id = '1412226235153731586' AND `status`=1
AND is_deleted = 0
GROUP BY dept_id) D ON D.dept_id = A.departmentid where 1=1
- <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1123598813738675201'">
- and A.jurisdiction = #{jurisdiction}
+ <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
+ and A.jurisdiction in(${jurisdiction})
</if>
</select>
@@ -1567,7 +1630,7 @@
IFNULL( d.num, 0 ) AS fwnum,
IFNULL( B.cznum, 0 ) AS cznum,
IFNULL( C.painum, 0 ) AS painum,
- IFNULL( D.znum, 0 ) AS znum
+ IFNULL( E.znum, 0 ) AS znum
FROM
sys_information i
LEFT JOIN ( SELECT COUNT( * ) num, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) d ON i.departmentid =
@@ -1612,9 +1675,9 @@
AND is_deleted = 0
GROUP BY
dept_id
- ) D ON D.dept_id = i.departmentid where 1=1
- <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1123598813738675201'">
- and i.jurisdiction = #{jurisdiction}
+ ) E ON E.dept_id = i.departmentid where 1=1 AND i.stats!=0
+ <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
+ and i.jurisdiction in(${jurisdiction})
</if>
</select>
@@ -1671,25 +1734,469 @@
dept_id
) D ON D.dept_id = i.departmentid
LEFT JOIN ( SELECT COUNT( * ) fwnum, dept_id FROM sys_dispatcher_unit GROUP BY dept_id ) E ON i.departmentid =
- E.dept_id WHERE 1 =1
- <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1123598813738675201'">
- and i.jurisdiction = #{jurisdiction}
+ E.dept_id WHERE 1 =1 AND i.stats!=0
+ <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
+ and i.jurisdiction in(${jurisdiction})
</if>
</select>
<select id="selectAge" resultType="java.util.HashMap">
SELECT
- IFNULL(TIMESTAMPDIFF( YEAR, bu.birthday, CURDATE( ) ),0) AS age
+ IFNULL(YEAR (now()) - YEAR (substring(bu.cardid, 7, 8)),0) AS age
FROM
blade_user bu
LEFT JOIN sys_information si ON si.departmentid = bu.dept_id
WHERE bu.`status`=1 AND bu.role_id='1412226235153731586'
- <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1123598813738675201'">
+ <if test="jurisdiction!=null and jurisdiction != '' and jurisdiction != '1372091709474910209'">
and bu.jurisdiction = #{jurisdiction}
</if>
<if test="deptid!=null and deptid != ''">
and bu.dept_id = #{deptid}
</if>
</select>
+
+
+ <!--查询所有辖区-->
+ <select id="selJur" resultType="java.util.HashMap">
+ SELECT dept.id,
+ dept_name as deptname
+ FROM sys_jurisdiction dept
+ WHERE (
+ SELECT CASE
+
+ WHEN
+ count(1) > 0 THEN
+ 1
+ ELSE 0
+ END
+ FROM sys_jurisdiction
+ WHERE parent_id = dept.id
+ AND is_deleted = 0
+ ) = 1
+ AND parent_id!=0
+ </select>
+
+ <!--查辖区的子数据-->
+ <select id="selJurchilder" resultType="java.lang.String">
+ SELECT GROUP_CONCAT(id) as id
+ FROM sys_jurisdiction
+ WHERE parent_id = #{id}
+ </select>
+
+ <select id="seleJuList" resultType="java.util.HashMap">
+ SELECT COUNT(stats) as num
+ FROM sys_information
+ WHERE stats = 0
+ AND jurisdiction IN (${substring})
+ UNION ALL
+ SELECT COUNT(stats)
+ FROM sys_information
+ WHERE stats = 1
+ AND jurisdiction IN (${substring})
+ UNION ALL
+ SELECT COUNT(stats)
+ FROM sys_information
+ WHERE stats = 2
+ AND jurisdiction IN (${substring})
+ UNION ALL
+ SELECT COUNT(stats)
+ FROM sys_information
+ WHERE stats = 3
+ AND jurisdiction IN (${substring})
+ UNION ALL
+ SELECT COUNT(stats)
+ FROM sys_information
+ WHERE stats = 4
+ AND jurisdiction IN (${substring})
+ </select>
+
+ <!--查询出所有辖区信息-->
+ <select id="selectJur" resultType="java.util.HashMap">
+ SELECT dept.id,
+ dept_name
+ FROM sys_jurisdiction dept
+ WHERE (
+ SELECT CASE
+
+ WHEN
+ count(1) > 0 THEN
+ 1
+ ELSE 0
+ END
+ FROM sys_jurisdiction
+ WHERE parent_id = dept.id
+ AND is_deleted = 0
+ ) = 1
+ AND parent_id!=0
+ </select>
+
+ <!--获取保安公司信息（本市保安公司，分公司）包含经纬度-->
+ <select id="getSecurityUnitPositionInfo" resultType="org.springblade.modules.information.vo.InformationVO">
+ select
+ si.*,sj.dept_name jurisdictionName
+ from
+ sys_information si
+ left join
+ sys_jurisdiction sj
+ on
+ si.jurisdiction = sj.id
+ where 1=1
+ and (stats = 2 or stats = 4)
+ </select>
+
+ <!--根据辖区查询保安公司分页信息（本市保安公司，分公司）-->
+ <select id="getSecurityUnitInfoPage" resultType="org.springblade.modules.information.vo.InformationVO">
+ select
+ si.*,sj.dept_name jurisdictionName
+ from
+ sys_information si
+ left join
+ sys_jurisdiction sj
+ on
+ si.jurisdiction = sj.id
+ where 1=1
+ and (stats = 2 or stats = 4)
+ <if test="information.jurisdiction!=null and information.jurisdiction!=''">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ </select>
+
+ <sql id="getSecurity">
+ select
+ dept_id,ifnull(count(*),0) count
+ from blade_user bu
+ left join blade_role br
+ on bu.role_id = br.id
+ where
+ role_alias = "安保人员"
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ </sql>
+
+ <!--根据辖区查询统计保安公司持证情况分页信息（本市保安公司，分公司）-->
+ <select id="getSecurityUnitHoldInfoPage" resultType="org.springblade.modules.information.vo.InformationVO">
+ select
+ si.*,sj.dept_name jurisdictionName,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(c.count,0) pnum
+ from sys_information si
+ left join
+ (
+ <include refid="getSecurity"/>
+ group by dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ left join
+ (
+ <include refid="getSecurity"/>
+ and bu.hold = 1
+ group by dept_id
+ ) b
+ on
+ b.dept_id = si.departmentid
+ left join
+ (
+ <include refid="getSecurity"/>
+ and bu.hold = 2
+ group by dept_id
+ ) c
+ on
+ c.dept_id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ si.jurisdiction = sj.id
+ where 1=1
+ and (si.stats = 2 or si.stats = 4)
+ <if test="information.jurisdiction!=null and information.jurisdiction!=''">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ </select>
+
+ <!--根据辖区查询统计保安公司(1:持证率低于50% 2:派遣率低于50% 3：缴纳社保率低于50% 的保安公司个数及保安公司分页信息（本市保安公司，分公司）-->
+ <select id="getSecurityUnitLess50Page" resultType="org.springblade.modules.information.vo.InformationVO">
+ select c.*,sj.dept_name jurisdictionName from (
+ select
+ si.*,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(FORMAT((b.count/a.count)*100,2),0) pnum
+ from sys_information si
+ left join
+ (
+ <include refid="getSecurity"/>
+ group by dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ left join
+ (
+ <include refid="getSecurity"/>
+ <if test="type==1">
+ and bu.hold = 1
+ </if>
+ <if test="type==2">
+ and bu.dispatch = 0
+ </if>
+ <if test="type==3">
+ and bu.soil = 0
+ </if>
+ <if test="type==4">
+ and bu.insurance = 0
+ </if>
+ group by dept_id
+ ) b
+ on
+ b.dept_id = si.departmentid
+ )c
+ left join
+ sys_jurisdiction sj
+ on
+ c.jurisdiction = sj.id
+ where 1=1
+ and (c.stats = 2 or c.stats = 4)
+ and pnum < #{information.proportion}
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and c.departmentid = #{information.departmentid}
+ </if>
+ </select>
+
+ <!-- and (sj.id = #{information.jurisdiction} or sj.parent_id = #{information.jurisdiction})-->
+
+ <!--根据辖区查询统计保安公司考试通过率低于50%的保安公司个数及保安公司分页信息（本市保安公司，分公司）-->
+ <select id="getSecurityUnitExamLess50Page" resultType="org.springblade.modules.information.vo.InformationVO">
+ select d.*,sj.dept_name jurisdictionName from (
+ select
+ si.*,
+ ifnull(a.count,0) znum,
+ ifnull(b.count,0) cnum,
+ ifnull(FORMAT((b.count/c.count)*100,2),0) pnum
+ from sys_information si
+ left join
+ (
+ <include refid="getSecurity"/>
+ group by dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ left join
+ (
+ select b1.dept_id,ifnull(b2.count,0) count from
+ (
+ select
+ bu.dept_id,ifnull(count(*),0) count
+ from blade_user bu
+ left join blade_role br
+ on bu.role_id = br.id
+ where
+ role_alias = "安保人员"
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ group by dept_id
+ ) b1
+
+ left join
+ (
+ select count(*) count,bu.dept_id from
+ exam_score es
+ left join
+ blade_user bu
+ on
+ bu.id = es.user_id
+ where qualified = 0 group by bu.dept_id
+ ) b2
+ on
+ b1.dept_id = b2.dept_id
+ ) b
+ on
+ b.dept_id = si.departmentid
+ left join
+ (
+ select c1.dept_id,ifnull(c2.count,0) count from
+ (
+ select
+ bu.dept_id,ifnull(count(*),0) count
+ from blade_user bu
+ left join blade_role br
+ on bu.role_id = br.id
+ where
+ role_alias = "安保人员"
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ group by dept_id
+ ) c1
+
+ left join
+ (
+ select count(*) count,bu.dept_id from
+ exam_score es
+ left join
+ blade_user bu
+ on
+ bu.id = es.user_id
+ where 1=1 group by bu.dept_id
+ ) c2
+ on
+ c1.dept_id = c2.dept_id
+ ) c
+ on
+ c.dept_id = si.departmentid
+ )d
+ left join
+ sys_jurisdiction sj
+ on
+ d.jurisdiction = sj.id
+ where 1=1
+ and (d.stats = 2 or d.stats = 4)
+ and pnum < #{information.proportion}
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ </select>
+
+ <sql id="getSubstationWarn">
+ left join
+ sys_information si
+ on
+ si.departmentid = bu.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where
+ 1=1
+ and (si.stats = 2 or si.stats =4)
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ </sql>
+
+ <!--根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司）预警信息，包含（未持证，现实表现差，未缴纳社保，资格审查异常）-->
+ <select id="getSubstationWarnInfoPage" resultType="org.springblade.modules.information.vo.InformationVO">
+ select jurisdictionName,enterprisename,detail from (
+ (
+ select
+ si.jurisdiction id,
+ sj.parent_id,
+ sj.dept_name jurisdictionName,
+ si.enterprisename,
+ "表现差" detail
+ from sys_performance sp
+ left join
+ blade_user bu
+ on
+ bu.id = sp.securityId
+ left join
+ sys_information si
+ on
+ bu.dept_id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ where
+ 1=1
+ and (si.stats = 2 or si.stats =4)
+ and bu.is_deleted = 0
+ and bu.`status` = 1
+ and sp.score = 3
+ )
+
+ union
+ (
+ select
+ sj.id,
+ sj.parent_id,
+ sj.dept_name jurisdictionName,
+ si.enterprisename,
+ if(bu.hold=2,"未持证","证件吊销") as detail
+ from
+ blade_user bu
+ <include refid="getSubstationWarn"/>
+ and (bu.hold = 2 or bu.hold = 3)
+ )
+
+
+ union
+ (
+ select
+ sj.id,
+ sj.parent_id,
+ sj.dept_name jurisdictionName,
+ si.enterprisename,
+ "未缴纳社保" as detail
+ from
+ blade_user bu
+ <include refid="getSubstationWarn"/>
+ and bu.soil = 1
+ )
+
+ union
+ (
+ select
+ sj.id,
+ sj.parent_id,
+ sj.dept_name jurisdictionName,
+ si.enterprisename,
+ "审查异常" as detail
+ from
+ blade_user bu
+ <include refid="getSubstationWarn"/>
+ and bu.examination_type = 1
+ )
+ ) a
+ where 1=1
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and (a.id = #{information.jurisdiction} or a.parent_id = #{information.jurisdiction})
+ </if>
+ </select>
+
+ <!--根据辖区查询统计当前辖区下的保安公司（本市保安公司，分公司））服务对象小于2家的公司数量的分页信息-->
+ <select id="getSecurityUnitServerLess2Page" resultType="org.springblade.modules.information.vo.InformationVO">
+ select * from
+ (
+ select
+ DISTINCT
+ si.id,
+ si.departmentid,
+ si.jurisdiction,
+ si.enterprisename,
+ sj.dept_name jurisdictionName,
+ ifnull(a.count,0) znum,
+ sdu.name dispatchUnitName,
+ sdu.end_time
+ from sys_information si
+ left join
+ sys_dispatcher_unit sdu
+ on
+ si.departmentid = sdu.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ (
+ select ifnull(count(*),0) count,dept_id from sys_dispatcher_unit
+ where 1=1
+ and start_time <= now()
+ and end_time > now()
+ GROUP BY dept_id
+ ) a
+ on
+ a.dept_id = si.departmentid
+ where 1=1
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1372091709474910209'">
+ and sj.id = #{information.jurisdiction}
+ </if>
+ ) b
+ where b.znum < 2
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and b.departmentid = #{information.departmentid}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3