From 24797ef3f03b3b59f9ddced9a7d4962a7efc413c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Nov 2021 09:05:09 +0800
Subject: [PATCH] 资格审查内网穿透
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 46 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 40 insertions(+), 6 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 60cc750..3c355ba 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,9 @@
<result column="work_status" property="work_status"/>
<result column="examination_type" property="examination_type"/>
<result column="examination_mx" property="examination_mx"/>
+ <result column="audit_time" property="auditTime"/>
+ <result column="cardid" property="cardid"/>
+ <result column="district" property="district"/>
</resultMap>
<resultMap id="userResultMaps" type="org.springblade.modules.system.vo.UsersVo">
<result column="id" property="id"/>
@@ -59,6 +62,8 @@
<result column="examination_type" property="examination_type"/>
<result column="examination_mx" property="examination_mx"/>
<result column="dept_name" property="deptName"/>
+ <result column="audit_time" property="auditTime"/>
+ <result column="cardid" property="cardid"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -104,7 +109,7 @@
blade_role br
on
s.role_id=br.id
- where s.is_deleted = 0 and br.role_alias ='qfqkdw'
+ where s.is_deleted = 0
<if test="user.account!=null and user.account != ''">
and s.account = #{user.account}
</if>
@@ -212,8 +217,7 @@
on
bu.role_id=br.id
where
- br.role_alias ='qfqkdw'
- and bu.is_deleted=0
+ bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
@@ -243,9 +247,9 @@
left join
blade_region br
on
- bu.region_id = br.code
- where bu.region_id is not null
- group by bu.region_id
+ bu.district = br.code
+ where bu.district is not null
+ group by bu.district
</select>
<!-- 统计六大队伍数量 -->
@@ -304,4 +308,34 @@
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>
+
+
+ <!--查询用户数据,未审核的-->
+ <select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id, cardid
+ from blade_user
+ where examination_type is null
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3