From 6d8a43de07062234a05716fcbb94273709cab21e Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期二, 16 七月 2019 17:04:36 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 74 insertions(+), 11 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml
index cb2d11a..f425ad1 100644
--- a/java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/owner/OwnerServiceDaoImplMapper.xml
@@ -17,13 +17,13 @@
<!-- 鏌ヨ涓氫富淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
<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 t.ownerTypeCd
+ 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
from business_building_owner t
where 1 =1
<if test="operate !=null and operate != ''">
and t.operate= #{operate}
</if>
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -63,11 +63,11 @@
<!-- 淇濆瓨涓氫富淇℃伅鑷� 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
+sex,name,link,status_cd,remark,owner_id,b_id,user_id,age,member_id,owner_type_cd
) 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
from business_building_owner t where 1=1
and t.operate= 'ADD'
-<if test="sex !=null and sex != ''">
+<if test="sex !=null">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -106,10 +106,10 @@
<select id="getOwnerInfo" parameterType="Map" resultType="Map">
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,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 t.ownerTypeCd
+ 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
from building_owner t
where 1 =1
-<if test="sex !=null and sex != ''">
+<if test="sex !=null">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -163,7 +163,7 @@
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
, t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -197,7 +197,7 @@
<select id="queryOwnersCount" parameterType="Map" resultType="Map">
select count(1) count
FROM building_owner t
-<if test="sex !=null and sex != ''">
+<if test="sex !=null ">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -243,7 +243,7 @@
AND cm.`community_id` = #{communityId}
AND cm.`status_cd` = '0'
AND t.`status_cd` = '0'
- <if test="sex !=null and sex != ''">
+ <if test="sex !=null ">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -284,13 +284,13 @@
<!-- 鏌ヨ涓氫富淇℃伅 add by wuxw 2018-07-03 -->
<select id="getOwnerInfoByCondition" parameterType="Map" resultType="Map">
select t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,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 t.ownerTypeCd
+ 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
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'
- <if test="sex !=null and sex != ''">
+ <if test="sex !=null ">
and t.sex= #{sex}
</if>
<if test="name !=null and name != ''">
@@ -333,5 +333,68 @@
limit #{page}, #{row}
</if>
</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>
+
+ <!-- queryOwnersByRoom -->
+ <!-- 鏍规嵁鎴垮眿鏌ヨ涓氫富淇℃伅 -->
+ <select id="queryOwnersByRoom" parameterType="Map" resultType="Map">
+ SELECT t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,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,
+ r.`room_id` roomId,r.`room_num` roomNum
+ FROM building_room r,building_owner_room_rel orr,building_owner t
+ WHERE r.`room_id` = orr.`room_id`
+ AND orr.`owner_id` = t.`owner_id`
+ <if test="roomId !=null and roomId != ''">
+ AND r.`room_id` = #{roomId}
+ </if>
+ <if test="roomIds != null ">
+ and r.room_id in
+ <foreach collection="roomIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ AND r.`status_cd` = '0'
+ AND orr.`status_cd` = '0'
+ AND t.`status_cd` = '0'
+ </select>
+
+ <!-- 鏍规嵁鍋滆溅浣嶆煡璇� -->
+ <select id="queryOwnersByParkingSpace" parameterType="Map" resultType="Map">
+
+ select ps.num,ps.ps_id psId,t.sex,t.name,t.link,t.status_cd,t.status_cd statusCd,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
+ from p_parking_space ps , owner_car oc,building_owner t
+ where ps.ps_id = oc.ps_id
+ and oc.owner_id = t.owner_id
+ AND oc.`status_cd` = '0'
+ AND ps.`status_cd` = '0'
+ AND t.`status_cd` = '0'
+ <if test="psIds != null ">
+ and ps.ps_id in
+ <foreach collection="psIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="psId !=null and psId != ''">
+ AND ps.`ps_id` = #{psId}
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0