From 00754b2fb8e71be738e6c312e11d62e64a4e82c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Dec 2021 17:13:59 +0800
Subject: [PATCH] 1.二维码批量生成修改，新增图片批量下载 2.用户修改 rtime bug 修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 237 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 196 insertions(+), 41 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 224e874..2bccbda 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -97,6 +97,14 @@
sys_jurisdiction sj
on
sj.id = i.jurisdiction
+ left join
+ blade_dept bd
+ on
+ bd.id = i.departmentid
+ left join
+ blade_user bu
+ on
+ bu.id = i.create_user_id
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})
@@ -108,27 +116,30 @@
and i.representative like concat(concat('%', #{information.representative}),'%')
</if>
<if test="information.stats!=null and information.stats!=''">
- and i.stats=#{information.stats}
+ and i.stats=#{information.stats} and bd.dept_category = 1
</if>
<if test="information.departmentid!=null and information.departmentid!=''">
and i.departmentid=#{information.departmentid}
</if>
+ <if test="information.createDeptId!=null and information.createDeptId!=''">
+ and bu.dept_id =#{information.createDeptId}
+ </if>
+ order by i.id desc
</select>
<delete id="deleteIn">
- delete
- from sys_information
- where creditCode = #{creditcode}
+ delete from sys_information
+ where departmentid = #{departmentid}
</delete>
<delete id="deleteSh">
delete
from sys_shareholder
- where creditCode = #{creditcode}
+ where dept_id = #{deptId}
</delete>
<delete id="deleteMe">
delete
from sys_member
- where creditCode = #{creditcode}
+ where dept_id = #{deptId}
</delete>
<select id="selectCount" resultType="java.util.HashMap">
@@ -165,9 +176,8 @@
</select>
<delete id="deleteDept">
- delete
- from blade_dept
- where id = #{departmentid}
+ update blade_dept set is_deleted = 1
+ where id = #{id}
</delete>
<!--资格审查异常数量-->
@@ -177,16 +187,26 @@
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
+ 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
+ ) 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
+ ) B
+ ON H.departmentid = B.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction = #{jurisdiction}
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
@@ -203,7 +223,8 @@
(
SELECT departmentid,jurisdiction FROM sys_information GROUP BY departmentid,jurisdiction
) H
- LEFT JOIN(
+ LEFT JOIN
+ (
SELECT
COUNT( * ) AS thisnum,
dept_id
@@ -216,8 +237,10 @@
AND hold = 1
GROUP BY
dept_id
- ) A ON A.dept_id=H.departmentid
- LEFT JOIN (
+ ) A
+ ON A.dept_id=H.departmentid
+ LEFT JOIN
+ (
SELECT
COUNT(*) AS lastnum,
dept_id
@@ -230,13 +253,18 @@
AND hold = 2
GROUP BY
dept_id
- ) B ON B.dept_id=H.departmentid
+ ) B
+ ON B.dept_id=H.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
<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>
<!--派遣服务单位统计-->
@@ -268,7 +296,8 @@
AND dispatch = 0
GROUP BY
dept_id
- ) A ON A.dept_id = H.departmentid
+ ) A
+ ON A.dept_id = H.departmentid
LEFT JOIN (
SELECT
COUNT( * ) AS lastnum,
@@ -282,9 +311,15 @@
AND dispatch = 1
GROUP BY
dept_id
- ) B ON H.departmentid = B.dept_id where 1=1
+ ) B
+ ON H.departmentid = B.dept_id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and H.jurisdiction = #{jurisdiction}
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
and H.departmentid = #{deptid}
@@ -294,20 +329,38 @@
<select id="selectSoil" resultType="java.util.HashMap">
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
+ (
+ 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
+ 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
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = H.jurisdiction
+ where 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
<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>
@@ -340,16 +393,118 @@
<!--查询本年所有月份h合同开始时间的客户数量-->
<select id="queryYearKh" resultType="java.util.HashMap">
SELECT
- start_time,
- end_time
+ sdu.start_time,
+ sdu.end_time
FROM
- `sys_dispatcher_unit`
- WHERE YEAR (end_time) >='2021'
+ sys_dispatcher_unit sdu
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = sdu.jurisdiction
+ where 1=1
+ and YEAR (end_time) >= #{year}
<if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
- and jurisdiction =#{jurisdiction}
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
<if test="deptid!=null and deptid!=''">
- and dept_id =#{deptid}
+ and sdu.dept_id =#{deptid}
</if>
</select>
+
+ <!--根据deptid 删除用户信息-->
+ <update id="deleteUserByDeptId">
+ update blade_user set is_deleted = 1 where dept_id = #{deptId}
+ </update>
+ <!--查辖区的子数据-->
+ <select id="selJurchilder" resultType="java.lang.String">
+ SELECT GROUP_CONCAT(id) as id
+ FROM sys_jurisdiction
+ WHERE parent_id = #{id}
+ </select>
+
+ <!--查询当前单位是否有子级单位-->
+ <select id="getDeptHashChildren" resultType="org.springblade.modules.system.entity.Dept">
+ select * from blade_dept where is_deleted = 0 and parent_id = #{information.departmentid}
+ </select>
+
+ <!--查询单位的人数-->
+ <select id="selectInformationUserNumCount" resultType="java.lang.Integer">
+ SELECT COUNT( * ) FROM blade_user
+ WHERE 1=1
+ and role_id = '1412226235153731586'
+ and is_deleted = 0
+ AND status=1
+ and dept_id in
+ (
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{dept.id} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ </select>
+
+ <!--查询单位的已派遣人数-->
+ <select id="selectInformationDispatcherNumCount" resultType="java.lang.Integer">
+ SELECT COUNT( * ) FROM blade_user
+ WHERE 1=1
+ and role_id = '1412226235153731586'
+ and is_deleted = 0
+ AND status=1
+ AND dispatch=0
+ and dept_id in
+ (
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{dept.id} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ </select>
+
+ <!--查询单位持证的人数-->
+ <select id="selectInformationHoldNumCount" resultType="java.lang.Integer">
+ SELECT COUNT( * ) FROM blade_user
+ WHERE 1=1
+ and role_id = '1412226235153731586'
+ and is_deleted = 0
+ AND status=1
+ AND hold=1
+ and dept_id in
+ (
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{dept.id} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ </select>
+
</mapper>
--
Gitblit v1.9.3