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/OwnerServiceDaoImplMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index 79afb77..b0ec5f4 100755
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -7,9 +7,9 @@
<!-- 淇濆瓨涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveBusinessOwnerInfo" parameterType="Map">
insert into business_building_owner(
- operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state
+ operate,sex,name,link,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state,owner_flag
) values (
- #{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd},#{communityId},#{idCard},#{state}
+ #{operate},#{sex},#{name},#{link},#{remark},#{ownerId},#{bId},#{userId},#{age},#{memberId},#{ownerTypeCd},#{communityId},#{idCard},#{state},#{ownerFlag}
)
</insert>
@@ -18,7 +18,7 @@
<select id="getBusinessOwnerInfo" parameterType="Map" resultType="Map">
select t.operate,t.sex,t.name,t.link,t.remark,t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
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.community_id,t.community_id communityId,
+ t.owner_type_cd ownerTypeCd,t.community_id,t.community_id communityId,t.owner_flag,t.owner_flag ownerFlag,
t.id_card, t.id_card idCard,t.state
from business_building_owner t
where 1 =1
@@ -71,9 +71,9 @@
<!-- 淇濆瓨涓氫富淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveOwnerInfoInstance" parameterType="Map">
insert into building_owner(
- sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state
+ sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd,community_id,id_card,state,owner_flag
) select t.sex,t.name,t.link,'0',t.remark,t.owner_id,t.b_id,t.user_id,t.age,t.member_id,t.owner_type_cd,
- t.community_id communityId,t.id_card,state
+ t.community_id communityId,t.id_card,state,t.owner_flag
from business_building_owner t where 1=1
and t.operate= 'ADD'
<if test="sex !=null">
@@ -124,7 +124,8 @@
t.owner_id,t.owner_id ownerId,t.b_id,t.b_id bId,
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
+ t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName,
+ t.owner_flag,t.owner_flag ownerFlag
<if test="roomIds != null">
, borr.room_id roomId
</if>
@@ -135,15 +136,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}
@@ -179,8 +180,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="ownerFlag !=null and ownerFlag != ''">
+ and t.owner_flag= #{ownerFlag}
</if>
<if test="age !=null and age != ''">
and t.age= #{age}
@@ -264,8 +265,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="ownerFlag !=null and ownerFlag != ''">
+ and t.owner_flag= #{ownerFlag}
</if>
<if test="age !=null and age != ''">
and t.age= #{age}
@@ -367,8 +368,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="ownerFlag !=null and ownerFlag != ''">
+ and t.owner_flag= #{ownerFlag}
</if>
<if test="age !=null and age != ''">
and t.age= #{age}
@@ -381,6 +382,12 @@
</if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
+ </if>
+ <if test="ownerTypeCds != null ">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
@@ -419,8 +426,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="ownerFlag !=null and ownerFlag != ''">
+ and t.owner_flag= #{ownerFlag}
</if>
<if test="age !=null and age != ''">
and t.age= #{age}
@@ -430,6 +437,12 @@
</if>
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
+ </if>
+ <if test="ownerTypeCds != null ">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
@@ -473,8 +486,8 @@
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
+ <if test="ownerFlag !=null and ownerFlag != ''">
+ and t.owner_flag= #{ownerFlag}
</if>
<if test="age !=null and age != ''">
and t.age= #{age}
@@ -491,6 +504,12 @@
<if test="ownerTypeCd !=null and ownerTypeCd != ''">
and t.owner_type_cd= #{ownerTypeCd}
</if>
+ <if test="ownerTypeCds != null ">
+ and t.owner_type_cd in
+ <foreach collection="ownerTypeCds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
--
Gitblit v1.8.0