From e97177f932bc9ab48f7acddcbcd22e6ceb318bea Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 06 Jan 2022 11:01:51 +0800
Subject: [PATCH] 1. 许可证信息新增 2. 工商表信息新增 3. 保安公司tree 接口修改 4. 管理人实体修改 5. 保安，公司相关接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 0cbd524..8e4cb0a 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -42,7 +42,8 @@
i.*,
IFNULL(A.znum ,0) as znum,
IFNULL(B.cnum ,0) as cnum,
- IFNULL(C.pnum ,0) as pnum
+ IFNULL(C.pnum ,0) as pnum,
+ sj.dept_name jurisdictionName
FROM
sys_information i
LEFT JOIN
@@ -73,7 +74,7 @@
and is_deleted = 0
and role_id = '1412226235153731586'
AND status=1
- AND dispatch=0
+ AND dispatch='0'
GROUP BY dept_id
) C
ON C.dept_id = i.departmentid
@@ -1267,7 +1268,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 0
+ AND bu.dispatch = '0'
GROUP BY
bu.dept_id
) C ON C.dept_id = A.departmentid
@@ -1510,7 +1511,7 @@
role_id = '1412226235153731586'
AND is_deleted = 0
AND STATUS = 1
- AND dispatch = 0
+ AND dispatch = '0'
GROUP BY
dept_id,
jurisdiction
@@ -1562,7 +1563,7 @@
jurisdiction
FROM blade_user
WHERE role_id = '1412226235153731586' and status=1
- AND dispatch = 0
+ AND dispatch = '0'
GROUP BY dept_id,
jurisdiction
) D ON A.departmentid = D.dept_id
@@ -1647,7 +1648,7 @@
and status = 1
and is_deleted = 0
and role_id = "1412226235153731586"
- and dispatch = 0
+ and dispatch = '0'
GROUP BY
dept_id
) F
@@ -1879,7 +1880,7 @@
FROM
blade_user
WHERE
- dispatch = 0
+ dispatch = '0'
AND role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
@@ -1936,7 +1937,7 @@
FROM
blade_user
WHERE
- dispatch = 0
+ dispatch = '0'
AND role_id = '1412226235153731586'
AND `status` = 1
AND is_deleted = 0
@@ -2174,7 +2175,7 @@
and bu.hold = 1
</if>
<if test="type==2">
- and bu.dispatch = 0
+ and bu.dispatch = '0'
</if>
<if test="type==3">
and bu.soil = 0
@@ -2634,7 +2635,7 @@
role_alias = "安保人员"
AND bu.is_deleted = 0
AND bu.`status` = 1
- AND bu.dispatch = 0
+ AND bu.dispatch = '0'
GROUP BY
dept_id
) b ON a.dept_id = b.dept_id
@@ -2943,7 +2944,7 @@
and bu.hold = 1
</if>
<if test="type==2">
- and bu.dispatch = 0
+ and bu.dispatch = '0'
</if>
<if test="type==3">
and bu.soil = 0
@@ -3125,7 +3126,7 @@
and role_id = '1412226235153731586'
and is_deleted = 0
AND status=1
- AND dispatch=0
+ AND dispatch='0'
and dept_id in
(
SELECT
@@ -3382,7 +3383,7 @@
)
</select>
- <!--查询单位的审查异常人数-->
+ <!--查询单位的社保缴纳人数-->
<select id="selectInformationUnitJnsbNumCount" resultType="java.lang.Integer">
SELECT COUNT(*) FROM blade_user
WHERE
@@ -3472,7 +3473,7 @@
bu.`status` = 1
AND bu.is_deleted = 0
AND bu.role_id = '1412226235153731586'
- AND bu.dispatch = 0
+ AND bu.dispatch = '0'
GROUP BY
bu.dept_id
) C ON C.dept_id = A.departmentid
@@ -3648,7 +3649,7 @@
and status = 1
and is_deleted = 0
and role_id = "1412226235153731586"
- and dispatch = 0
+ and dispatch = '0'
GROUP BY
dept_id
) F
@@ -3674,4 +3675,33 @@
</if>
</select>
+ <!--更具部门id 查询所有的父级部门id包含本身-->
+ <select id="getDeptDetails" resultType="java.lang.String">
+ SELECT
+ T1._id
+ FROM
+ (
+ SELECT
+ @r AS _id,
+ ( SELECT @r := parent_id FROM blade_dept WHERE id = _id ) AS parent_id,
+ @l := @l + 1 AS lvl
+ FROM
+ ( SELECT @r := #{information.departmentid}, @l := 0 ) vars,
+ blade_dept h
+ ) T1
+ where T1._id!=0
+ AND T1._id != 1413470343230877697
+ AND T1._id != 1418458374477549569
+ AND T1._id != 1420222768149966850
+ AND T1._id != 1425366663452196865
+ order by T1._id
+ </select>
+
+ <!--根据部门id 查询公司信息-->
+ <select id="getInformationDetails" resultType="org.springblade.modules.information.vo.InformationVO">
+ select si.*,sj.dept_name jurisdictionName from sys_information si
+ left join sys_jurisdiction sj on sj.id = si.jurisdiction
+ where si.departmentid = #{deptId}
+ </select>
+
</mapper>
--
Gitblit v1.9.3