From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 7aaef1b..79afb77
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -125,6 +125,9 @@
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
+ <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
@@ -153,7 +156,7 @@
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}
@@ -495,14 +498,14 @@
<!-- 鏌ヨ鏈叆椹讳笟涓� 鎬绘暟 -->
<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'
where o.status_cd = '0'
and o.owner_type_cd = '1001'
and o.community_id = #{communityId}
- and orr.rel_id is null or orr.state in ('2001','2003')
+ and orr.rel_id is null
</select>
<!-- queryOwnersByRoom -->
@@ -527,6 +530,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ and t.owner_type_cd = '1001'
AND r.`status_cd` = '0'
AND orr.`status_cd` = '0'
AND t.`status_cd` = '0'
@@ -544,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
@@ -557,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