From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
index e8d4639..1783f95 100644
--- a/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/OwnerServiceDaoImplMapper.xml
@@ -125,6 +125,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.create_time createTime,t.community_id,
t.community_id communityId,t.id_card, t.id_card idCard,t.state,td.name ownerTypeName
+ <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
@@ -203,6 +206,7 @@
#{item}
</foreach>
</if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
@@ -382,15 +386,12 @@
</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>
@@ -442,11 +443,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>
@@ -498,20 +497,15 @@
</select>
<!-- 鏌ヨ鏈叆椹讳笟涓� 鎬绘暟 -->
<select id="queryNoEnterRoomOwnerCount" parameterType="Map" resultType="Map">
- 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'
+ select
+ COUNT(1) count
+ 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 +530,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'
--
Gitblit v1.8.0