From 61153d869fddb7d2a429b862b5b2831910464fe1 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 03 Sep 2021 17:58:29 +0800
Subject: [PATCH] 1.辖区
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 215 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 144 insertions(+), 71 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 0369c11..128cee9 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -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">
@@ -1164,7 +1164,7 @@
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!=''">
@@ -1181,7 +1181,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 +1191,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 +1200,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 +1314,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 +1368,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},'%')
@@ -1408,8 +1408,8 @@
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'">
- 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 +1474,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 +1492,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 +1507,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 +1524,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 +1551,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 +1565,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 +1610,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 +1669,100 @@
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
+ YEAR (now()) - YEAR (substring(bu.cardid, 7, 8)) 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>
</mapper>
--
Gitblit v1.9.3