From ba5210dc8c6c537cacc59c18d58baa9744cd2b9d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 10 五月 2022 11:14:39 +0800
Subject: [PATCH] 优化报修单推送bug
---
java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml | 353 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 204 insertions(+), 149 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 cc86c26..6c992b9
--- a/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerRoomRelServiceDaoImplMapper.xml
@@ -5,182 +5,237 @@
<mapper namespace="ownerRoomRelServiceDaoImpl">
<!-- 淇濆瓨涓氫富鎴垮眿淇℃伅 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 id="saveBusinessOwnerRoomRelInfo" parameterType="Map">
+ 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>
- <!-- 鏌ヨ涓氫富鎴垮眿淇℃伅锛圔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
-from business_building_owner_room_rel t
-where 1 =1
-<if test="relId !=null and relId != ''">
- and t.rel_id= #{relId}
-</if>
-<if test="operate !=null and operate != ''">
- and t.operate= #{operate}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<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>
-
- </select>
+ <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,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 != ''">
+ and t.rel_id= #{relId}
+ </if>
+ <if test="operate !=null and operate != ''">
+ and t.operate= #{operate}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <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>
+ </select>
<!-- 淇濆瓨涓氫富鎴垮眿淇℃伅鑷� 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 business_building_owner_room_rel t where 1=1
-<if test="relId !=null and relId != ''">
- and t.rel_id= #{relId}
-</if>
- and t.operate= 'ADD'
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<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>
+ 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}
+ </if>
+ and t.operate= 'ADD'
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <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>
</insert>
-
<!-- 鏌ヨ涓氫富鎴垮眿淇℃伅 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
-from building_owner_room_rel t
-where 1 =1
-<if test="relId !=null and relId != ''">
- and t.rel_id= #{relId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<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>
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ 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,
+ 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}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
+
+ <if test="roomId !=null and roomId != ''">
+ and t.room_id= #{roomId}
+ </if>
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼涓氫富鎴垮眿淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateOwnerRoomRelInfoInstance" parameterType="Map">
- update building_owner_room_rel t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
-<if test="state !=null and state != ''">
-, t.state= #{state}
-</if>
-<if test="ownerId !=null and ownerId != ''">
-, t.owner_id= #{ownerId}
-</if>
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if>
-<if test="roomId !=null and roomId != ''">
-, t.room_id= #{roomId}
-</if>
- where 1=1 <if test="relId !=null and relId != ''">
-and t.rel_id= #{relId}
-</if>
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if>
+ update building_owner_room_rel t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ , t.owner_id= #{ownerId}
+ </if>
+ <if test="userId !=null and userId != ''">
+ , t.user_id= #{userId}
+ </if>
+ <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}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
</update>
<!-- 鏌ヨ涓氫富鎴垮眿鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryOwnerRoomRelsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from building_owner_room_rel t
-where 1 =1
-<if test="relId !=null and relId != ''">
- and t.rel_id= #{relId}
-</if>
-<if test="statusCd !=null and statusCd != ''">
- and t.status_cd= #{statusCd}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="state !=null and state != ''">
- and t.state= #{state}
-</if>
-<if test="ownerId !=null and ownerId != ''">
- and t.owner_id= #{ownerId}
-</if>
-<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>
+ <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>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="ownerId !=null and ownerId != ''">
+ and t.owner_id= #{ownerId}
+ </if>
+ <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>
- </select>
+ </select>
</mapper>
--
Gitblit v1.8.0