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 | 134 ++++++++++++++++++++++++++++++--------------
1 files changed, 90 insertions(+), 44 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 e8d4639..b0ec5f4
--- 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,11 @@
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>
from building_owner t,t_dict td
<if test="roomId != null and roomId != ''">
,building_owner_room_rel borr
@@ -132,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}
@@ -153,7 +157,7 @@
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
- and t.name like concat('%',#{name},'%')
+ and t.name = #{name}
</if>
<if test="link !=null and link != ''">
and t.link= #{link}
@@ -176,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}
@@ -203,6 +207,7 @@
#{item}
</foreach>
</if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -260,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}
@@ -363,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}
@@ -378,19 +383,22 @@
<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>
</select>
-
<!-- 鏌ヨ涓氫富鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryOwnersCountByCondition" parameterType="Map" resultType="Map">
select count(1) count
- FROM building_owner t , s_community_member cm
- WHERE t.`member_id` = cm.`member_id`
- AND cm.`community_id` = #{communityId}
- AND cm.`status_cd` = '0'
- AND t.`status_cd` = '0'
+ FROM building_owner t
+ WHERE
+ t.`status_cd` = '0'
<if test="sex !=null ">
and t.sex= #{sex}
</if>
@@ -418,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}
@@ -429,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>
@@ -442,11 +456,9 @@
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.id_card, t.id_card idCard
- FROM building_owner t , s_community_member cm
- WHERE t.`member_id` = cm.`member_id`
- AND cm.`community_id` = #{communityId}
- AND cm.`status_cd` = '0'
- AND t.`status_cd` = '0'
+ FROM building_owner t
+ WHERE
+ t.`status_cd` = '0'
<if test="sex !=null ">
and t.sex= #{sex}
</if>
@@ -474,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}
@@ -492,26 +504,27 @@
<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>
</select>
<!-- 鏌ヨ鏈叆椹讳笟涓� 鎬绘暟 -->
<select id="queryNoEnterRoomOwnerCount" parameterType="Map" resultType="Map">
- SELECT
+ select
COUNT(1) count
- FROM
- building_owner_room_rel a,
- building_owner o,
- s_community_member m
- WHERE a.`state` IN ('2001', '2003')
- AND a.`owner_id` = o.`owner_id`
- AND o.`owner_id` = m.`member_id`
- AND m.`member_type_cd` = '390001200005'
- AND m.`community_id` = #{communityId}
- AND a.`status_cd` = '0'
- AND o.`status_cd` = '0'
- AND m.`status_cd` = '0'
+ from
+ building_owner o
+ left join building_owner_room_rel orr on o.owner_id = orr.owner_id and orr.status_cd = '0'
+ where o.status_cd = '0'
+ and o.owner_type_cd = '1001'
+ and o.community_id = #{communityId}
+ and orr.rel_id is null
</select>
<!-- queryOwnersByRoom -->
@@ -536,6 +549,7 @@
<if test="communityId !=null and communityId != ''">
and t.community_id= #{communityId}
</if>
+ and t.owner_type_cd = '1001'
AND r.`status_cd` = '0'
AND orr.`status_cd` = '0'
AND t.`status_cd` = '0'
@@ -553,6 +567,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
@@ -566,5 +581,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