From e48f17558e2c8d3fcb1cf2cbc0d539130ee3eb33 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Sep 2021 15:56:38 +0800
Subject: [PATCH] 缴费查询修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 593 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 389 insertions(+), 204 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 508a693..257fcfb 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
@@ -175,160 +175,244 @@
</if>
</select>
+ <!-- <!–统计上个月和这个月交社保的人数以及缴纳金额–>-->
+ <!-- <select id="selectTo" resultType="java.util.HashMap">-->
+ <!-- SELECT IFNULL(A.lastmonth, 0) AS lastmonth,-->
+ <!-- IFNULL(B.thismouth, 0) AS thismouth,-->
+ <!-- IFNULL(A.amount, 0) AS lastamount,-->
+ <!-- IFNULL(B.amount, 0) AS thisamount,-->
+ <!-- IFNULL( C.userthismouth, 0 ) AS userthismouth,-->
+ <!-- IFNULL( D.userlastmouth, 0 ) AS userlastmouth,-->
+ <!-- IFNULL( E.userpcthismouth, 0 ) AS userpcthismouth,-->
+ <!-- IFNULL( F.userpclastmouth, 0 ) AS userpclastmouth-->
+ <!-- FROM (-->
+ <!-- SELECT COUNT(*) AS lastmonth,-->
+ <!-- amount,-->
+ <!-- deptid-->
+ <!-- FROM-->
+ <!-- sys_socil-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY i.departmentid )-->
+ <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and deptid =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- amount,-->
+ <!-- deptid-->
+ <!-- ) A-->
+ <!-- left JOIN (-->
+ <!-- SELECT COUNT(*) AS thismouth,-->
+ <!-- amount,-->
+ <!-- deptid-->
+ <!-- FROM-->
+ <!-- sys_socil-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY i.departmentid )-->
+ <!-- AND DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and deptid =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- amount,-->
+ <!-- deptid-->
+ <!-- ) B ON A.deptid = B.deptid-->
+ <!-- LEFT JOIN (-->
+ <!-- SELECT COUNT(*) AS userthismouth,-->
+ <!-- dept_id-->
+ <!-- FROM-->
+ <!-- blade_user-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- i.departmentid-->
+ <!-- )-->
+ <!-- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND status=1-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and dept_id =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- dept_id-->
+ <!-- ) C ON C.dept_id = A.deptid-->
+ <!-- LEFT JOIN(-->
+ <!-- SELECT COUNT(*) AS userlastmouth,-->
+ <!-- dept_id-->
+ <!-- FROM-->
+ <!-- blade_user-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- i.departmentid-->
+ <!-- )-->
+ <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND status=1-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and dept_id =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- dept_id-->
+ <!-- ) D ON D.dept_id = A.deptid-->
+ <!-- LEFT JOIN (-->
+ <!-- SELECT COUNT(*) AS userpcthismouth,-->
+ <!-- dept_id-->
+ <!-- FROM-->
+ <!-- blade_user-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- i.departmentid-->
+ <!-- )-->
+ <!-- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND dispatch=0-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and dept_id =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- dept_id-->
+ <!-- ) E ON E.dept_id = A.deptid-->
+ <!-- LEFT JOIN(-->
+ <!-- SELECT COUNT(*) AS userpclastmouth,dept_id-->
+ <!-- FROM-->
+ <!-- blade_user-->
+ <!-- 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!='1372091709474910209'">-->
+ <!-- and i.jurisdiction =#{jurisdiction}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- i.departmentid-->
+ <!-- )-->
+ <!-- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND dispatch=0-->
+ <!-- <if test="deptid!=null and deptid!=''">-->
+ <!-- and dept_id =#{deptid}-->
+ <!-- </if>-->
+ <!-- GROUP BY-->
+ <!-- dept_id-->
+ <!-- ) F ON F.dept_id = A.deptid-->
+ <!-- </select> -->
<!--统计上个月和这个月交社保的人数以及缴纳金额-->
<select id="selectTo" resultType="java.util.HashMap">
SELECT IFNULL(A.lastmonth, 0) AS lastmonth,
IFNULL(B.thismouth, 0) AS thismouth,
- IFNULL(A.amount, 0) AS lastamount,
- IFNULL(B.amount, 0) AS thisamount,
- IFNULL( C.userthismouth, 0 ) AS userthismouth,
- IFNULL( D.userlastmouth, 0 ) AS userlastmouth,
- IFNULL( E.userpcthismouth, 0 ) AS userpcthismouth,
- IFNULL( F.userpclastmouth, 0 ) AS userpclastmouth
- FROM (
+ IFNULL(C.thisamount, 0) AS thisamount,
+ IFNULL(D.lastamount, 0) AS lastamount,
+ IFNULL(E.userthismouth, 0) AS userthismouth,
+ IFNULL(F.userlastmouth, 0) AS userlastmouth,
+ IFNULL(G.userpcthismouth, 0) AS userpcthismouth,
+ IFNULL(J.userpclastmouth, 0) AS userpclastmouth
+ FROM (SELECT departmentid, jurisdiction FROM sys_information GROUP BY departmentid, jurisdiction) H
+ LEFT JOIN (
SELECT COUNT(*) AS lastmonth,
- amount,
deptid
- FROM
- sys_socil
- 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>
- GROUP BY i.departmentid )
- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( insuredtime, '%Y%m' ) ) = 1
- <if test="deptid!=null and deptid!=''">
- and deptid =#{deptid}
- </if>
- GROUP BY
- amount,
- deptid
- ) A
- left JOIN (
+ FROM sys_socil
+ WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(insuredtime, '%Y%m')) = 1
+ GROUP BY deptid
+ ) A ON A.deptid = H.departmentid
+ LEFT JOIN (
SELECT COUNT(*) AS thismouth,
- amount,
deptid
- FROM
- sys_socil
- 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>
- GROUP BY i.departmentid )
- AND DATE_FORMAT( insuredtime, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' )
- <if test="deptid!=null and deptid!=''">
- and deptid =#{deptid}
- </if>
- GROUP BY
- amount,
+ FROM sys_socil
+ WHERE DATE_FORMAT(insuredtime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ GROUP BY deptid
+ ) B ON B.deptid = H.departmentid
+ LEFT JOIN (
+ SELECT SUM(amount) AS thisamount,
deptid
- ) B ON A.deptid = B.deptid
+ FROM sys_socil
+ WHERE DATE_FORMAT(insuredtime, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ GROUP BY deptid
+ ) C ON C.deptid = H.departmentid
+ LEFT JOIN (
+ SELECT SUM(amount) AS lastamount,
+ deptid
+ FROM sys_socil
+ WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(insuredtime, '%Y%m')) = 1
+ GROUP BY deptid
+ ) D ON D.deptid = H.departmentid
LEFT JOIN (
SELECT COUNT(*) AS userthismouth,
dept_id
- FROM
- blade_user
- 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>
- GROUP BY
- i.departmentid
- )
- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND status=1
- <if test="deptid!=null and deptid!=''">
- and dept_id =#{deptid}
- </if>
- GROUP BY
- dept_id
- ) C ON C.dept_id = A.deptid
- LEFT JOIN(
+ FROM blade_user
+ WHERE DATE_FORMAT(update_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) E ON E.dept_id = H.departmentid
+ LEFT JOIN (
SELECT COUNT(*) AS userlastmouth,
dept_id
- FROM
- blade_user
- 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>
- GROUP BY
- i.departmentid
- )
- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND status=1
- <if test="deptid!=null and deptid!=''">
- and dept_id =#{deptid}
- </if>
- GROUP BY
- dept_id
- ) D ON D.dept_id = A.deptid
+ FROM blade_user
+ WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(update_time, '%Y%m')) = 1
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) F ON F.dept_id = H.departmentid
LEFT JOIN (
SELECT COUNT(*) AS userpcthismouth,
dept_id
- FROM
- blade_user
- 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>
- GROUP BY
- i.departmentid
- )
- AND DATE_FORMAT( update_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ), '%Y%m' ) AND dispatch=0
- <if test="deptid!=null and deptid!=''">
- and dept_id =#{deptid}
- </if>
- GROUP BY
+ FROM blade_user
+ WHERE DATE_FORMAT(update_time, '%Y%m') = DATE_FORMAT(CURDATE(), '%Y%m')
+ AND dispatch = 0
+ AND STATUS = 1
+ AND is_deleted = 0
+ GROUP BY dept_id
+ ) G ON G.dept_id = H.departmentid
+ LEFT JOIN (
+ SELECT COUNT(*) AS userpclastmouth,
dept_id
- ) E ON E.dept_id = A.deptid
- LEFT JOIN(
- SELECT COUNT(*) AS userpclastmouth,dept_id
- FROM
- blade_user
- 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}
+ FROM blade_user
+ WHERE PERIOD_DIFF(date_format(now(), '%Y%m'), date_format(update_time, '%Y%m')) = 1
+ AND dispatch = 0
+ AND STATUS = 1
+ 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!='1372091709474910209'">
+ and H.jurisdiction =#{jurisdiction}
</if>
- GROUP BY
- i.departmentid
- )
- AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( update_time, '%Y%m' ) ) = 1 AND dispatch=0
<if test="deptid!=null and deptid!=''">
- and dept_id =#{deptid}
+ and H.departmentid =#{deptid}
</if>
- GROUP BY
- dept_id
- ) F ON F.dept_id = A.deptid
</select>
@@ -353,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
@@ -379,9 +463,11 @@
WHERE
YEAR ( s.update_time ) =#{year}
AND dispatch = 0
+ AND `status`=1
+ 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 )
@@ -410,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 )
@@ -434,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 )
@@ -491,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!=''">
@@ -536,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!=''">
@@ -581,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!=''">
@@ -623,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!=''">
@@ -666,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!=''">
@@ -703,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!=''">
@@ -733,13 +819,13 @@
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
)
- AND role_id='1412226235153731586'
+ AND role_id='1412226235153731586' and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -765,13 +851,13 @@
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
)
- AND role_id='1412226235153731586' AND examination_type=0
+ AND role_id='1412226235153731586' AND examination_type=0 and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -797,13 +883,13 @@
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
)
- AND role_id='1412226235153731586' AND hold=1
+ AND role_id='1412226235153731586' AND hold=1 and status=1 and is_deleted=0
<if test="deptid!=null and deptid!=''">
and dept_id =#{deptid}
</if>
@@ -832,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
@@ -863,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
@@ -885,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}
@@ -909,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}
@@ -925,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
@@ -948,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!=''">
@@ -963,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!=''">
@@ -974,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">
@@ -996,6 +1082,7 @@
IFNULL( G.yicnum, 0 ) AS yicnum,
A.dept_id,
d.enterpriseName AS deptname,
+ d.stats,
j.dept_name AS jurname
FROM
( SELECT COUNT( * ) AS num, dept_id, jurisdiction FROM blade_user WHERE role_id = '1412226235153731586' and
@@ -1077,11 +1164,14 @@
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}
</if>
</select>
@@ -1091,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
@@ -1101,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>
@@ -1110,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>
@@ -1224,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},'%')
@@ -1278,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},'%')
@@ -1293,6 +1383,7 @@
SELECT
A.enterpriseName,
A.departmentid,
+ A.stats,
A.jurisdiction,
A.dept_name as jurname,
IFNULL( B.num, 0 ) AS fwnum,
@@ -1302,6 +1393,7 @@
SELECT
i.enterpriseName,
i.departmentid,
+ i.stats,
i.jurisdiction,
j.dept_name
FROM
@@ -1316,18 +1408,37 @@
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},'%')
+ </if>
+ <if test="stats!=null and stats!=''">
+ and A.stats=#{stats}
</if>
</select>
<!--保安人员详情-->
<select id="selectUIn" resultType="java.util.HashMap">
- SELECT real_name,securitynumber,cardid,phone,hold,soil,photo,examination_type,dispatch FROM blade_user WHERE
- role_id='1412226235153731586' AND is_deleted=0 AND `status`=1
+ SELECT
+ u.real_name,
+ u.securitynumber,
+ u.cardid,
+ u.phone,
+ u.hold,
+ u.soil,
+ u.photo,
+ u.examination_type,
+ u.dispatch,
+ i.enterpriseName
+ FROM
+ blade_user u
+ LEFT JOIN sys_information i ON i.departmentid = u.dept_id
+ WHERE
+ u.role_id = '1412226235153731586'
+ AND u.is_deleted = 0
+ AND u.`status` =1
<if test="deptid!=null and deptid!=''">
and dept_id=#{deptid}
</if>
@@ -1363,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!=''">
@@ -1381,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>
@@ -1396,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
@@ -1412,11 +1523,10 @@
FROM (
SELECT u.enterpriseName,
u.departmentid,
- d.dept_name AS deptname,
+ u.jurisdiction,
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,
@@ -1441,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>
@@ -1455,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 =
@@ -1500,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>
@@ -1559,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