From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml | 83 +++++++++++++++++++++++++++++++++++------
1 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 6434dda..6c992b9
--- a/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml
@@ -6,18 +6,28 @@
<!-- 淇濆瓨涓氫富鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerRoomRelInfo" parameterType="Map">
- insert into business_building_owner_room_rel(
-rel_id,operate,remark,state,owner_id,b_id,user_id,room_id
-) values (
-#{relId},#{operate},#{remark},#{state},#{ownerId},#{bId},#{userId},#{roomId}
-)
- </insert>
+ insert into business_building_owner_room_rel(
+ rel_id,operate,remark,state,owner_id,b_id,user_id,room_id,start_time,end_time
+ ) values (
+ #{relId},#{operate},#{remark},#{state},#{ownerId},#{bId},#{userId},#{roomId},#{startTime},#{endTime}
+ )
+ </insert>
+
+
+ <insert id="saveOwnerRoomRels" parameterType="Map">
+ insert into building_owner_room_rel(
+ rel_id,remark,state,owner_id,b_id,user_id,room_id,start_time,end_time
+ ) values (
+ #{relId},#{remark},#{state},#{ownerId},-1,#{userId},#{roomId},#{startTime},#{endTime}
+ )
+ </insert>
<!-- 鏌ヨ涓氫富鎴垮眿淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<select id="getBusinessOwnerRoomRelInfo" parameterType="Map" resultType="Map">
select t.rel_id,t.rel_id relId,t.operate,t.remark,t.state,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id
- bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId
+ bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,t.start_time,t.end_time,t.start_time
+ startTime,t.end_time endTime
from business_building_owner_room_rel t
where 1 =1
<if test="relId !=null and relId != ''">
@@ -51,8 +61,10 @@
<!-- 淇濆瓨涓氫富鎴垮眿淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOwnerRoomRelInfoInstance" parameterType="Map">
insert into building_owner_room_rel(
- rel_id,status_cd,remark,state,owner_id,b_id,user_id,room_id
- ) select t.rel_id,'0',t.remark,t.state,t.owner_id,t.b_id,t.user_id,t.room_id from
+ rel_id,status_cd,remark,state,owner_id,b_id,user_id,room_id,start_time,end_time
+ )
+ select t.rel_id,'0',t.remark,t.state,t.owner_id,t.b_id,t.user_id,t.room_id,t.start_time,t.end_time
+ from
business_building_owner_room_rel t where 1=1
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
@@ -83,11 +95,35 @@
<!-- 鏌ヨ涓氫富鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerRoomRelInfo" parameterType="Map" resultType="Map">
select t.rel_id,t.rel_id relId,t.status_cd,t.status_cd statusCd,t.remark,t.state,t.owner_id,t.owner_id
- ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId
+ ownerId,t.b_id,t.b_id bId,t.user_id,t.user_id userId,t.room_id,t.room_id roomId,
+ t.start_time,t.end_time,t.start_time startTime,t.end_time endTime
+ <if test="byOwnerInfo == true">
+ ,bow.name ownerName,bow.id_card idCard,bow.link
+ </if>
from building_owner_room_rel t
+ <if test="byOwnerInfo == true">
+ ,building_owner bow
+ </if>
where 1 =1
+ <if test="byOwnerInfo == true">
+ and t.owner_id = bow.owner_id
+ and bow.community_id = #{communityId}
+ and bow.status_cd = '0'
+ </if>
+ <if test="byOwnerInfo == true and ownerName !=null and ownerName != ''">
+ and bow.name = #{ownerName}
+ </if>
+ <if test="byOwnerInfo == true and ownerNameLike !=null and ownerNameLike != ''">
+ and bow.name like concat('%',#{ownerNameLike},'%')
+ </if>
+ <if test="byOwnerInfo == true and idCard !=null and idCard != ''">
+ and bow.id_card = #{idCard}
+ </if>
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
+ </if>
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
</if>
<if test="statusCd !=null and statusCd != ''">
and t.status_cd= #{statusCd}
@@ -104,9 +140,7 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
- </if>
+
<if test="roomId !=null and roomId != ''">
and t.room_id= #{roomId}
</if>
@@ -138,6 +172,12 @@
<if test="roomId !=null and roomId != ''">
, t.room_id= #{roomId}
</if>
+ <if test="startTime !=null">
+ , t.start_time= #{startTime}
+ </if>
+ <if test="endTime !=null">
+ , t.end_time= #{endTime}
+ </if>
where 1=1
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
@@ -152,7 +192,24 @@
<select id="queryOwnerRoomRelsCount" parameterType="Map" resultType="Map">
select count(1) count
from building_owner_room_rel t
+ <if test="byOwnerInfo == true">
+ ,building_owner bow
+ </if>
where 1 =1
+ <if test="byOwnerInfo == true">
+ and t.owner_id = bow.owner_id
+ and bow.community_id = #{communityId}
+ and bow.status_cd = '0'
+ </if>
+ <if test="byOwnerInfo == true and ownerName !=null and ownerName != ''">
+ and bow.name = #{ownerName}
+ </if>
+ <if test="byOwnerInfo == true and ownerNameLike !=null and ownerNameLike != ''">
+ and bow.name like concat('%',#{ownerNameLike},'%')
+ </if>
+ <if test="byOwnerInfo == true and idCard !=null and idCard != ''">
+ and bow.id_card = #{idCard}
+ </if>
<if test="relId !=null and relId != ''">
and t.rel_id= #{relId}
</if>
--
Gitblit v1.8.0