Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-09-14 db410b1c7b3e3ad5b6b0ec9b9c49e037a672424a

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

 java110-db/src/main/resources/mapper/community/FloorV1ServiceDaoImplMapper.xml

@@ -21,10 +21,12 @@

    <!-- 查询楼栋信息 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
LEFT JOIN f_floor_attr t2 on t.floor_id = t2.floor_id
where t2.spec_cd='100201912001' and t2.value='8008' and t.status_cd=0
        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
        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> 
@@ -94,10 +96,11 @@

    <!-- 查询楼栋数量 add by wuxw 2018-07-03 -->
     <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
where t2.spec_cd='100201912001' and t2.value='8008' and t.status_cd=0
        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>