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

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 java110-db/src/main/resources/mapper/report/ReportCommunityServiceDaoImplMapper.xml

@@ -96,6 +96,12 @@
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="leaseTypes !=null ">
            and t.lease_type in
            <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
@@ -115,6 +121,12 @@
        where t.status_cd = '0'
        <if test="state !=null and state != ''">
            and t.state= #{state}
        </if>
        <if test="leaseTypes !=null ">
            and t.lease_type in
            <foreach collection="leaseTypes" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -211,6 +223,7 @@
        left join building_owner_room_rel borr on t.room_id =  borr.room_id and borr.status_cd = '0'
        left join building_owner bo on borr.owner_id =  bo.member_id and bo.status_cd = '0'
        WHERE 1 =1
        and t.status_cd = '0'
        and u.unit_id = #{unitId}
        and t.community_id= #{communityId}
        order by CONVERT(t.layer,SIGNED),CONVERT(t.room_num,SIGNED)