From 5fd47c20d64ec1b09a30cdaeef20c4ccbaad5376 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 26 Mar 2024 11:57:04 +0800
Subject: [PATCH] 用户名修改成住户名称

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   75 ++++++++++++++++++++++++++++++++++---
 1 files changed, 68 insertions(+), 7 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 1aafc40..0b87927 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -84,6 +84,10 @@
         <if test="user.roleId!=null and user.roleId!=''">
             and role_id like concat('%',#{user.roleId},'%')
         </if>
+
+        <if test="user.deptId!=null and user.deptId!=''">
+            and dept_id like concat('%',#{user.deptId},'%')
+        </if>
     </select>
 
     <select id="searchUserByDistrictId" resultType="org.springblade.modules.system.entity.User">
@@ -229,34 +233,91 @@
             )
 
     </select>
-    <select id="getUserInfoByDistrictIds" resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity"
-            parameterType="java.util.List">
+    <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">
 
         SELECT
+        jhe.house_name address,
         bu.id,
         bu.tenant_id,
         bu.code,
         bu.user_type,
         bu.account,
-        bu.name,
+        jh.name,
         bu.real_name,
         bu.avatar,
         bu.email,
-        bu.phone,
-        bu.birthday
+        bu.phone phoneNumber,
+        bu.birthday,
+        jhe.building,
+        jhe.unit
         FROM
         blade_user bu
-        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id
+        LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
         LEFT JOIN jczz_house jhe ON jhe.house_code = jh.house_code
         LEFT JOIN jczz_district jd on jd.aoi_code=jhe.district_code
         <where>
-            and jd.id = in
+            and jd.id  in
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
             and bu.is_deleted = 0
+            and jh.relationship !=18
+            <if test="vo.building != null and vo.building !=''">
+                and jhe.building like concat('%',#{vo.building},'%')
+            </if>
+            <if test="vo.unit != null and vo.unit !=''">
+                and jhe.unit like concat('%',#{vo.unit},'%')
+            </if>
+            <if test="vo.name != null and vo.name !=''">
+                and jh.name like concat('%',#{vo.name},'%')
+            </if>
+            <if test="vo.phoneNumber != null and vo.phoneNumber !=''">
+                and jh.phone_number like concat('%',#{vo.phoneNumber},'%')
+            </if>
         </where>
     </select>
 
 
+    <select id="selectUserByDept" resultMap="userResultMap">
+        select * from blade_user where is_deleted = 0
+        and id != 1123598821738675201
+        <if test="deptIdList!=null and deptIdList.size>0">
+            and id in (
+            SELECT
+            user_id
+            FROM
+            blade_user_dept
+            WHERE
+            dept_id IN
+            <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            )
+        </if>
+        ORDER BY create_time desc
+    </select>
+
+
+    <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User">
+        SELECT
+            bu.id,
+            bu.name,
+            bu.phone
+        FROM
+            blade_user bu
+        where 1 = 1
+          and  bu.lat is not null
+          and  bu.lng is not null
+          and IFNULL((
+                 ACOS(
+                 SIN(
+                 (#{latitude} * 3.1415) / 180) * SIN((bu.lat * 3.1415) / 180) +
+                 COS((#{latitude} * 3.1415) / 180) * COS((bu.lat * 3.1415) / 180) * COS((#{longitude} * 3.1415) / 180
+                 - (bu.lng * 3.1415) / 180)) * 6370.996
+                 ), 2) &lt;= 1
+          and  bu.role_id like concat('%','1727864411451359233','%')
+          and bu.is_deleted = 0 and bu.status = 2 limit 1
+    </select>
+
+
 </mapper>

--
Gitblit v1.9.3