From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 63 insertions(+), 20 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index a043b33..e20519f
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -118,8 +118,6 @@
</insert>
-
-
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerInfo" parameterType="Map" resultType="Map">
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,t.remark,
@@ -127,26 +125,38 @@
t.user_id,t.user_id userId,t.age,t.member_id,t.member_id memberId,t.owner_type_cd,
t.owner_type_cd ownerTypeCd,t.create_time createTime,t.community_id,
t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName
- , borr.room_id roomId
- from
- building_owner t
- left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
- left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id
- where 1 =1
+ <if test="roomIds != null">
+ , borr.room_id roomId
+ </if>
+ from building_owner t,t_dict td
<if test="roomId != null and roomId != ''">
+ ,building_owner_room_rel borr
+ </if>
+ <if test="roomIds != null ">
+ ,building_owner_room_rel borr
+ </if>
+ where 1 = 1
+ <if test="roomId != null and roomId != ''">
+ and t.owner_id = borr.owner_id
+ and borr.status_cd = t.status_cd
and borr.room_id = #{roomId}
</if>
<if test="roomIds != null">
+ and t.owner_id = borr.owner_id
+ and borr.status_cd = t.status_cd
and borr.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
</if>
+ and td.table_name = 'building_owner'
+ and td.`table_columns` = 'owner_type_cd'
+ and td.status_cd = t.owner_type_cd
<if test="sex !=null">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
- and t.name like concat('%',#{name},'%')
+ and t.name = #{name}
</if>
<if test="link !=null and link != ''">
and t.link= #{link}
@@ -206,15 +216,22 @@
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerInfoCount" parameterType="Map" resultType="Map">
select count(1) count
- from
- building_owner t
- left join t_dict td on td.table_name = 'building_owner' and td.`table_columns` = 'owner_type_cd' and td.status_cd = t.owner_type_cd
- left join building_owner_room_rel borr on borr.status_cd = '0' and t.owner_id = borr.owner_id
+ from building_owner t
+ <if test="roomId != null and roomId != ''">
+ ,building_owner_room_rel borr
+ </if>
+ <if test="roomIds != null ">
+ ,building_owner_room_rel borr
+ </if>
where 1 =1
<if test="roomId != null and roomId != ''">
+ and t.owner_id = borr.owner_id
+ and borr.status_cd = '0'
and borr.room_id = #{roomId}
</if>
<if test="roomIds != null">
+ and t.owner_id = borr.owner_id
+ and borr.status_cd = '0'
and borr.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -267,12 +284,6 @@
</if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
- </if>
- <if test="ownerTypeCds != null">
- and t.owner_type_cd in
- <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
- #{item}
- </foreach>
</if>
</select>
@@ -487,7 +498,7 @@
<!-- 鏌ヨ鏈叆椹讳笟涓� 鎬绘暟 -->
<select id="queryNoEnterRoomOwnerCount" parameterType="Map" resultType="Map">
select
- COUNT(1) count
+ COUNT(1) count
from
building_owner o
left join building_owner_room_rel orr on o.owner_id = orr.owner_id and orr.status_cd = '0'
@@ -537,6 +548,7 @@
and oc.owner_id = t.owner_id
AND oc.`status_cd` = '0'
AND ps.`status_cd` = '0'
+ and oc.car_type_cd='1001'
AND t.`status_cd` = '0'
<if test="psIds != null ">
and ps.ps_id in
@@ -550,5 +562,36 @@
</select>
+ <select id="queryOwnerLogsByRoom" parameterType="Map" resultType="Map">
+ SELECT
+ bo.owner_id ownerId,
+ bo.`name`,
+ bo.link,
+ t.start_time startTime,
+ t.end_time endTime,
+ t.create_time createTime,
+ t.room_id roomId
+ FROM
+ business_building_owner_room_rel t
+ INNER JOIN building_owner bo ON t.owner_id = bo.owner_id AND bo.status_cd = '0' AND bo.community_id = #{communityId}
+ WHERE
+ t.operate = 'ADD'
+ AND t.room_id = #{roomId}
+ ORDER BY
+ t.create_time DESC
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+ </select>
+
+ <select id="queryOwnerLogsCountByRoom" parameterType="Map" resultType="Map">
+ select
+ COUNT(1) count
+ from business_building_owner_room_rel t
+ inner join building_owner bo on t.owner_id = bo.owner_id and bo.status_cd = '0' and bo.community_id = #{communityId}
+ where t.operate = 'ADD'
+ and t.room_id = #{roomId}
+ order by t.create_time desc
+ </select>
</mapper>
--
Gitblit v1.8.0