From 998fae7b1fb43c18634fea8f3045dbd313fde91b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 22 Aug 2021 18:04:36 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 104 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 99 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 71692b9..83cf1b4 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -29,6 +29,7 @@
<result column="work_status" property="work_status"/>
<result column="examination_type" property="examination_type"/>
<result column="examination_mx" property="examination_mx"/>
+ <result column="district" property="district"/>
</resultMap>
<resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
<result column="id" property="id"/>
@@ -62,7 +63,7 @@
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user
+ select * from blade_user
where is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
and tenant_id = #{tenantId}
@@ -94,15 +95,17 @@
</if>
ORDER BY id
</select>
+
+
<select id="selectUserPages" resultMap="userResultMaps">
- select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
LEFT JOIN sys_position p ON p.snumber = s.CODE
LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
left join
blade_role br
on
s.role_id=br.id
- where s.is_deleted = 0 and br.role_alias ='处警员'
+ where s.is_deleted = 0 and br.role_alias ='qfqkdw'
<if test="user.account!=null and user.account != ''">
and s.account = #{user.account}
</if>
@@ -135,7 +138,7 @@
</select>
<select id="selectUserPagetxl" resultMap="userResultMaps">
- select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
+ select s.*,p.jd,p.wd,ST_ASTEXT ( e.coordinate ) from blade_user s
LEFT JOIN sys_position p ON p.snumber = s.CODE
LEFT JOIN sys_enclosure e ON e.anumber = s.CODE
left join
@@ -210,7 +213,7 @@
on
bu.role_id=br.id
where
- br.role_alias ='处警员'
+ br.role_alias ='qfqkdw'
and bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
@@ -231,4 +234,95 @@
<select id="selectUser" resultType="java.util.HashMap">
select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
</select>
+
+ <!--统计用户注册数据-->
+ <select id="getUserRegisterStatisticsData" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">
+ SELECT
+ br.name as region,
+ count(*) num
+ FROM blade_user bu
+ left join
+ blade_region br
+ on
+ bu.district = br.code
+ where bu.district is not null
+ group by bu.district
+ </select>
+
+ <!-- 统计六大队伍数量 -->
+ <select id="getUserTypeCount" resultType="org.springblade.modules.system.vo.UserRegisterStatisVO">
+ SELECT
+ '治保会队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615693403414529'
+ UNION ALL
+ SELECT
+ '内保干部队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615773594312705'
+ UNION ALL
+ SELECT
+ '治安巡防队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615835435130881'
+ UNION ALL
+ SELECT
+ '信息员队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615909959524354'
+ UNION ALL
+ SELECT
+ '保安员队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424615972718895106'
+ UNION ALL
+ SELECT
+ '警务辅助队伍' AS region,
+ count( * ) num
+ FROM
+ blade_user bu
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ dept.id = '1424616047083905026'
+ </select>
+
+ <select id="getUserDistrictTypeCount" resultType="org.springblade.modules.system.vo.UserDistrictStatisVO">
+ SELECT
+ br.NAME AS region,
+ count( * ) num ,
+ count( CASE WHEN dept.dept_name = '治保会队伍' THEN 1 END) as zbh,
+ count( CASE WHEN dept.dept_name = '内保干部队伍' THEN 1 END) as nbgb,
+ count( CASE WHEN dept.dept_name = '治安巡防队伍' THEN 1 END) as zaxf,
+ count( CASE WHEN dept.dept_name = '信息员队伍' THEN 1 END) as xxy,
+ count( CASE WHEN dept.dept_name = '保安员队伍' THEN 1 END) as bay,
+ count( CASE WHEN dept.dept_name = '警务辅助队伍' THEN 1 END) as jwfz
+ FROM
+ blade_user bu
+ LEFT JOIN blade_region br ON bu.district = br.CODE
+ LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
+ WHERE
+ bu.district IS NOT NULL
+ GROUP BY
+ bu.district
+ </select>
</mapper>
--
Gitblit v1.9.3