From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index d85f588..03a008c
--- a/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml
@@ -23,7 +23,8 @@
select t.apartment,t.built_up_area builtUpArea,t.community_id communityId,t.create_time createTime,
t.fee_coefficient feeCoefficient,t.layer,t.room_id roomId,t.room_num roomNum,t.section,
t.state,bu.unit_id unitId,bu.unit_num unitNum,ff.floor_id floorId,ff.floor_num floorNum,
- bo.age,bo.id_card idCard,bo.link,bo.member_id memberId,bo.`name`,bo.owner_id ownerId
+ bo.age,bo.id_card idCard,bo.link,bo.member_id memberId,bo.`name`,bo.`name` ownerName,bo.owner_id ownerId,t.room_type roomType,
+ t.room_sub_type roomSubType,t.room_rent roomRent,t.room_area roomArea
from building_room t
INNER JOIN building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
inner join f_floor ff on bu.floor_id = ff.floor_id and ff.status_cd = '0'
@@ -64,7 +65,7 @@
ps.num,pa.pa_id paId,pa.num areaNum,ps.state,t.start_time startTime,t.end_time endTime
from owner_car t
INNER JOIN building_owner bo on t.owner_id = bo.member_id and t.status_cd = '0'
- left join parking_space ps on t.ps_id = t.ps_id and ps.status_cd = '0'
+ left join parking_space ps on t.ps_id = ps.ps_id and ps.status_cd = '0'
left join parking_area pa on ps.pa_id = pa.pa_id and pa.status_cd = '0'
where t.status_cd = '0'
<if test="state !=null and state != ''">
@@ -78,5 +79,63 @@
</if>
</select>
+ <!-- 鏌ヨ灏忓尯淇℃伅 add by wuxw 2018-07-03 -->
+ <select id="getCommunitys" parameterType="Map" resultType="Map">
+ select t.address,t.nearby_landmarks,t.nearby_landmarks nearbyLandmarks,
+ t.city_code,t.city_code cityCode,t.name,t.status_cd,t.status_cd statusCd,t.tel,
+ t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.map_y,t.map_y mapY,
+ t.map_x,t.map_x mapX,t.state,ca.area_code areaCode,ca.area_name areaName,
+ ca.parent_area_code parentAreaCode,ca.parent_area_name parentAreaName,
+ t.community_area communityArea
+ from s_community t,city_area ca
+ where t.status_cd = '0'
+ and t.city_code = ca.area_code
+ and ca.status_cd = '0'
+ <if test="address !=null and address != ''">
+ and t.address= #{address}
+ </if>
+ <if test="nearbyLandmarks !=null and nearbyLandmarks != ''">
+ and t.nearby_landmarks= #{nearbyLandmarks}
+ </if>
+ <if test="cityCode !=null and cityCode != ''">
+ and t.city_code= #{cityCode}
+ </if>
+ <if test="name !=null and name != ''">
+ and t.name like concat('%',#{name},'%')
+ </if>
+ <if test="statusCd !=null and statusCd != ''">
+ and t.status_cd= #{statusCd}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="communityIds !=null">
+ and t.community_id in
+ <foreach collection="communityIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
+ <if test="mapY !=null and mapY != ''">
+ and t.map_y= #{mapY}
+ </if>
+ <if test="mapX !=null and mapX != ''">
+ and t.map_x= #{mapX}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ order by t.create_time ASC
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
+
+ </select>
+
+
+
+
</mapper>
--
Gitblit v1.8.0