From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml | 23 +++++++----------------
1 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml
index a1347ac..41e300f 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerRoomRelV1ServiceDaoImplMapper.xml
@@ -1,19 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
- PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="ownerRoomRelV1ServiceDaoImpl">
-
<!-- 淇濆瓨涓氫富鎴垮眿鍏崇郴琛ㄤ俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveOwnerRoomRelInfo" parameterType="Map">
- insert into building_owner_room_rel(
- rel_id,remark,start_time,state,end_time,owner_id,user_id,room_id
- ) values (
- #{relId},#{remark},#{startTime},#{state},#{endTime},#{ownerId},#{userId},#{roomId}
- )
+ insert into building_owner_room_rel(rel_id, remark, start_time, state, end_time, owner_id, user_id, room_id)
+ values (#{relId}, #{remark}, #{startTime}, #{state}, #{endTime}, #{ownerId}, #{userId}, #{roomId})
</insert>
-
<!-- 鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄤ俊鎭� add by wuxw 2018-07-03 -->
<select id="getOwnerRoomRelInfo" parameterType="Map" resultType="Map">
@@ -57,9 +51,7 @@
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
-
<!-- 淇敼涓氫富鎴垮眿鍏崇郴琛ㄤ俊鎭� add by wuxw 2018-07-03 -->
<update id="updateOwnerRoomRelInfo" parameterType="Map">
@@ -92,7 +84,6 @@
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
</if>
-
</update>
<!-- 鏌ヨ涓氫富鎴垮眿鍏崇郴琛ㄦ暟閲� add by wuxw 2018-07-03 -->
@@ -131,15 +122,15 @@
<select id="queryRoomCountByOwnerIds" parameterType="Map" resultType="Map">
select t.owner_id ownerId,count(1) roomCount
- from
- building_owner_room_rel t
+ from building_owner_room_rel t
+ left join building_room br on br.room_id = t.room_id
where t.status_cd = '0'
+ and br.status_cd = '0'
and t.owner_id in
<foreach collection="ownerIds" item="item" open="(" close=")" separator=",">
#{item}
</foreach>
+ and br.state != '2008'
group by t.owner_id
</select>
-
-
</mapper>
--
Gitblit v1.8.0