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 | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 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 d3cf5b0..e20519f
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -135,15 +135,15 @@
<if test="roomIds != null ">
,building_owner_room_rel borr
</if>
- where 1 =1
+ where 1 = 1
<if test="roomId != null and roomId != ''">
and t.owner_id = borr.owner_id
- and borr.status_cd = '0'
+ 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 = '0'
+ and borr.status_cd = t.status_cd
and borr.room_id in
<foreach collection="roomIds" item="item" open="(" close=")" separator=",">
#{item}
@@ -498,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'
@@ -548,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
@@ -561,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