From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml | 202 +++++++++++++++++++++++++-------------------------
1 files changed, 102 insertions(+), 100 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml
index a8f5d4e..0156ee7 100644
--- a/java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml
@@ -5,123 +5,125 @@
<mapper namespace="floorV1ServiceDaoImpl">
-
-
-
<!-- 淇濆瓨妤兼爧淇℃伅 add by wuxw 2018-07-03 -->
<insert id="saveFloorInfo" parameterType="Map">
insert into f_floor(
-floor_id,name,remark,b_id,community_id,user_id,floor_num,floor_area
-) values (
-#{floorId},#{name},#{remark},#{bId},#{communityId},#{userId},#{floorNum},#{floorArea}
-)
+ floor_id,name,remark,b_id,community_id,user_id,floor_num,floor_area,seq
+ ) values (
+ #{floorId},#{name},#{remark},#{bId},#{communityId},#{userId},#{floorNum},#{floorArea},#{seq}
+ )
</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.remark,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.user_id,t.user_id userId,t.floor_num,t.floor_num floorNum,t.floor_area,t.floor_area floorArea
-from f_floor t
-where 1 =1
-<if test="floorId !=null and floorId != ''">
- and t.floor_id= #{floorId}
-</if>
-<if test="name !=null and name != ''">
- and t.name= #{name}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="bId !=null and bId != ''">
- and t.b_id= #{bId}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-<if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
-</if>
-<if test="floorNum !=null and floorNum != ''">
- and t.floor_num= #{floorNum}
-</if>
-<if test="floorArea !=null and floorArea != ''">
- and t.floor_area= #{floorArea}
-</if>
-order by t.create_time desc
-<if test="page != -1 and page != null ">
- limit #{page}, #{row}
-</if>
+ select t.floor_id,t.floor_id floorId,t.name floorName,t.remark,t.b_id,t.b_id bId,t.community_id,t.community_id
+ communityId,t.user_id,t.user_id userId,t3.name userName,
+ t.floor_num,t.floor_num floorNum,t.floor_area,t.floor_area floorArea,t.seq
+ from f_floor t
+ LEFT JOIN f_floor_attr t2 on t.floor_id = t2.floor_id and t2.spec_cd='100201912001' and t2.value='8008'
+ LEFT JOIN u_user t3 on t.user_id = t3.user_id and t3.status_cd = 0
+ where t.status_cd=0
+ <if test="floorId !=null and floorId != ''">
+ and t.floor_id= #{floorId}
+ </if>
+ <if test="name !=null and name != ''">
+ and t.name= #{name}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and t.floor_num= #{floorNum}
+ </if>
+ <if test="floorArea !=null and floorArea != ''">
+ and t.floor_area= #{floorArea}
+ </if>
+ order by t.seq
+ <if test="page != -1 and page != null ">
+ limit #{page}, #{row}
+ </if>
</select>
-
-
<!-- 淇敼妤兼爧淇℃伅 add by wuxw 2018-07-03 -->
<update id="updateFloorInfo" parameterType="Map">
- update f_floor t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if>
-<if test="name !=null and name != ''">
-, t.name= #{name}
-</if>
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if>
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if>
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if>
-<if test="floorNum !=null and floorNum != ''">
-, t.floor_num= #{floorNum}
-</if>
-<if test="floorArea !=null and floorArea != ''">
-, t.floor_area= #{floorArea}
-</if>
- where 1=1 <if test="floorId !=null and floorId != ''">
-and t.floor_id= #{floorId}
-</if>
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if>
+ update f_floor t set t.status_cd = #{statusCd}
+ <if test="newBId != null and newBId != ''">
+ ,t.b_id = #{newBId}
+ </if>
+ <if test="name !=null and name != ''">
+ , t.name= #{name}
+ </if>
+ <if test="remark !=null and remark != ''">
+ , t.remark= #{remark}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ , t.community_id= #{communityId}
+ </if>
+ <if test="userId !=null and userId != ''">
+ , t.user_id= #{userId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ , t.floor_num= #{floorNum}
+ </if>
+ <if test="floorArea !=null and floorArea != ''">
+ , t.floor_area= #{floorArea}
+ </if>
+ <if test="seq !=null and seq != ''">
+ , t.seq= #{seq}
+ </if>
+ where 1=1
+ <if test="floorId !=null and floorId != ''">
+ and t.floor_id= #{floorId}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
</update>
<!-- 鏌ヨ妤兼爧鏁伴噺 add by wuxw 2018-07-03 -->
- <select id="queryFloorsCount" parameterType="Map" resultType="Map">
- select count(1) count
-from f_floor t
-where 1 =1
-<if test="floorId !=null and floorId != ''">
- and t.floor_id= #{floorId}
-</if>
-<if test="name !=null and name != ''">
- and t.name= #{name}
-</if>
-<if test="remark !=null and remark != ''">
- and t.remark= #{remark}
-</if>
-<if test="bId !=null and bId != ''">
- and t.b_id= #{bId}
-</if>
-<if test="communityId !=null and communityId != ''">
- and t.community_id= #{communityId}
-</if>
-<if test="userId !=null and userId != ''">
- and t.user_id= #{userId}
-</if>
-<if test="floorNum !=null and floorNum != ''">
- and t.floor_num= #{floorNum}
-</if>
-<if test="floorArea !=null and floorArea != ''">
- and t.floor_area= #{floorArea}
-</if>
-
-
- </select>
+ <select id="queryFloorsCount" parameterType="Map" resultType="Map">
+ select count(1) count
+ from f_floor t
+ LEFT JOIN f_floor_attr t2 on t.floor_id = t2.floor_id
+ LEFT JOIN u_user t3 on t.user_id = t3.user_id and t3.status_cd = 0
+ where t2.spec_cd='100201912001' and t2.value='8008' and t.status_cd=0
+ <if test="floorId !=null and floorId != ''">
+ and t.floor_id= #{floorId}
+ </if>
+ <if test="name !=null and name != ''">
+ and t.name= #{name}
+ </if>
+ <if test="remark !=null and remark != ''">
+ and t.remark= #{remark}
+ </if>
+ <if test="bId !=null and bId != ''">
+ and t.b_id= #{bId}
+ </if>
+ <if test="communityId !=null and communityId != ''">
+ and t.community_id= #{communityId}
+ </if>
+ <if test="userId !=null and userId != ''">
+ and t.user_id= #{userId}
+ </if>
+ <if test="floorNum !=null and floorNum != ''">
+ and t.floor_num= #{floorNum}
+ </if>
+ <if test="floorArea !=null and floorArea != ''">
+ and t.floor_area= #{floorArea}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.8.0