From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 0c43572..4568229
--- a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
@@ -154,7 +154,10 @@
COUNT(1) count
FROM
f_floor f
- where f.`community_id` = #{communityId}
+ where 1=1
+ <if test="communityId !=null and communityId != ''">
+ and f.`community_id` = #{communityId}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id= #{floorId}
</if>
@@ -199,7 +202,10 @@
f.floor_area floorArea
FROM
f_floor f
- where f.`community_id` = #{communityId}
+ where 1=1
+ <if test="communityId !=null and communityId != ''">
+ and f.`community_id` = #{communityId}
+ </if>
<if test="floorId !=null and floorId != ''">
and f.floor_id= #{floorId}
</if>
@@ -224,9 +230,6 @@
<if test="bId !=null and bId != ''">
and f.b_id= #{bId}
</if>
- <if test="userId !=null and userId != ''">
- and f.user_id= #{userId}
- </if>
<if test="floorNum !=null and floorNum != ''">
and f.floor_num= #{floorNum}
</if>
@@ -237,4 +240,37 @@
</if>
</select>
+ <!-- 鏌ヨ灏忓尯鍗曞厓淇℃伅 add by wuxw 2018-07-03 -->
+ <select id="queryFloorAndUnits" parameterType="Map" resultType="Map">
+ select t.floor_id,t.floor_id floorId,bu.layer_count,bu.layer_count layerCount,bu.unit_id,bu.unit_id
+ unitId,bu.unit_num,bu.unit_num unitNum,bu.lift,bu.remark,bu.unit_area,bu.unit_area unitArea,t.floor_num floorNum
+ from f_floor t
+ left join building_unit bu on t.`floor_id` = bu.`floor_id` and bu.status_cd = '0'
+ where 1 =1
+ and t.status_cd = '0'
+ <if test="communityId!=null and communityId != ''">
+ AND t.community_id = #{communityId}
+ </if>
+ <if test="floorId !=null and floorId != ''">
+ and t.floor_id= #{floorId}
+ </if>
+ <if test="layerCount !=null and layerCount != ''">
+ and bu.layer_count= #{layerCount}
+ </if>
+ <if test="unitId !=null and unitId != ''">
+ and bu.unit_id= #{unitId}
+ </if>
+ <if test="unitNum !=null and unitNum != ''">
+ and bu.unit_num= #{unitNum}
+ </if>
+ <if test="lift !=null and lift != ''">
+ and bu.lift= #{lift}
+ </if>
+ order by t.floor_num,unitNum asc
+ <!-- <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>limit 10;-->
+
+ </select>
+
</mapper>
--
Gitblit v1.8.0