From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能
---
java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 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 91aed7e..3693f6e
--- a/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/FloorServiceDaoImplMapper.xml
@@ -7,16 +7,16 @@
<!-- 淇濆瓨灏忓尯妤间俊鎭� add by wuxw 2018-07-03 -->
<insert id="saveBusinessFloorInfo" parameterType="Map">
insert into business_floor(
- floor_id,operate,name,remark,b_id,user_id,floor_num
+ floor_id,operate,name,remark,b_id,user_id,floor_num,community_id,floor_area
) values (
- #{floorId},#{operate},#{name},#{remark},#{bId},#{userId},#{floorNum}
+ #{floorId},#{operate},#{name},#{remark},#{bId},#{userId},#{floorNum},#{communityId},#{floorArea}
)
</insert>
<!-- 鏌ヨ灏忓尯妤间俊鎭紙Business锛� add by wuxw 2018-07-03 -->
<select id="getBusinessFloorInfo" parameterType="Map" resultType="Map">
- select t.floor_id,t.operate,t.name,t.remark,t.b_id,t.user_id,t.floor_num
+ select t.floor_id,t.operate,t.name,t.remark,t.b_id,t.user_id,t.floor_num,t.community_id,t.floor_area
from business_floor t
where 1 =1
<if test="floorId !=null and floorId != ''">
@@ -40,15 +40,18 @@
<if test="floorNum !=null and floorNum != ''">
and t.floor_num= #{floorNum}
</if>
-
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</select>
<!-- 淇濆瓨灏忓尯妤间俊鎭嚦 instance琛ㄤ腑 add by wuxw 2018-07-03 -->
<insert id="saveFloorInfoInstance" parameterType="Map">
insert into f_floor(
- floor_id,name,status_cd,remark,b_id,user_id,floor_num
- ) select t.floor_id,t.name,'0',t.remark,t.b_id,t.user_id,t.floor_num from business_floor t where 1=1
+ floor_id,name,status_cd,remark,b_id,user_id,floor_num,community_id,floor_area
+ ) select t.floor_id,t.name,'0',t.remark,t.b_id,t.user_id,t.floor_num,t.community_id,t.floor_area
+ from business_floor t where 1=1
<if test="floorId !=null and floorId != ''">
and t.floor_id= #{floorId}
</if>
@@ -68,14 +71,17 @@
<if test="floorNum !=null and floorNum != ''">
and t.floor_num= #{floorNum}
</if>
-
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
</insert>
<!-- 鏌ヨ灏忓尯妤间俊鎭� add by wuxw 2018-07-03 -->
<select id="getFloorInfo" parameterType="Map" resultType="Map">
select t.floor_id,t.floor_id floorId,t.name,t.status_cd, t.status_cd statusCd,t.remark,t.b_id,
- t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum
+ t.b_id bId,t.user_id, t.user_id userId,t.floor_num ,t.floor_num floorNum,t.community_id communityId,t.community_id,
+ t.floor_area,t.floor_area floorArea
from f_floor t
where 1 =1
<if test="floorId !=null and floorId != ''">
@@ -99,10 +105,13 @@
<if test="floorNum !=null and floorNum != ''">
and t.floor_num= #{floorNum}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ order by t.create_time desc
<if test="page != -1 and page != null ">
limit #{page}, #{row}
</if>
-
</select>
@@ -114,6 +123,9 @@
</if>
<if test="name !=null and name != ''">
, t.name= #{name}
+ </if>
+ <if test="floorArea !=null and floorArea != ''">
+ , t.floor_area= #{floorArea}
</if>
<if test="remark !=null and remark != ''">
, t.remark= #{remark}
@@ -128,6 +140,9 @@
<if test="floorId !=null and floorId != ''">
and t.floor_id= #{floorId}
</if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
<if test="bId !=null and bId != ''">
and t.b_id= #{bId}
</if>
@@ -138,16 +153,25 @@
SELECT
COUNT(1) count
FROM
- f_floor f,
- s_community_member cm
- WHERE f.`floor_id` = cm.`member_id`
- AND cm.`member_type_cd` = '390001200004'
- AND cm.`community_id` = #{communityId}
+ f_floor f
+ 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>
+ <if test="floorIds !=null">
+ and f.floor_id in
+ <foreach collection="floorIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="name !=null and name != ''">
and f.name like concat('%',#{name},'%')
+ </if>
+ <if test="floorName !=null and floorName != ''">
+ and f.name like concat('%',#{floorName},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and f.status_cd= #{statusCd}
@@ -158,36 +182,44 @@
<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>
AND f.`status_cd` = '0'
- AND cm.`status_cd` = '0'
</select>
+
+
<!-- 鏌ヨ灏忓尯 鍐呯殑妤� -->
<select id="queryFloors" parameterType="Map" resultType="Map">
-
SELECT
f.`floor_id` floorId,
f.`floor_num` floorNum,
f.`name` floorName,
f.`remark`,
f.`user_id` userId,
- cm.`community_id` communityId
+ f.`community_id` communityId,
+ f.floor_area floorArea
FROM
- f_floor f,
- s_community_member cm
- WHERE f.`floor_id` = cm.`member_id`
- AND cm.`member_type_cd` = '390001200004'
- AND cm.`community_id` = #{communityId}
+ f_floor f
+ 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>
+ <if test="floorIds !=null">
+ and f.floor_id in
+ <foreach collection="floorIds" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
<if test="name !=null and name != ''">
and f.name like concat('%',#{name},'%')
+ </if>
+ <if test="floorName !=null and floorName != ''">
+ and f.name like concat('%',#{floorName},'%')
</if>
<if test="statusCd !=null and statusCd != ''">
and f.status_cd= #{statusCd}
@@ -205,11 +237,10 @@
and f.floor_num= #{floorNum}
</if>
AND f.`status_cd` = '0'
- AND cm.`status_cd` = '0'
+ order by f.create_time desc
<if test="page != -1 and page != null ">
LIMIT #{page}, #{row}
</if>
</select>
-
</mapper>
--
Gitblit v1.8.0