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

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 java110-db/src/main/resources/mapper/user/OwnerSettledApplyV1ServiceDaoImplMapper.xml

@@ -18,15 +18,29 @@
    <!-- 查询业主入驻申请信息 add by wuxw 2018-07-03 -->
    <select id="getOwnerSettledApplyInfo" parameterType="Map" resultType="Map">
        select t.apply_id,t.apply_id applyId,t.create_user_id,t.create_user_id
        createUserId,t.remark,t.status_cd,t.status_cd statusCd,t.state,t.owner_id,t.owner_id
        ownerId,t.community_id,t.community_id communityId
        createUserId,t.remark,t.state,t.owner_id,t.owner_id
        ownerId,t.community_id,t.community_id communityId,t.create_time createTime,td.name stateName,bo.`name` ownerName,bo.link ownerLink,
        count(osr.room_id) roomCount
        from owner_settled_apply t
        left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
        left join t_dict td on t.state = td.status_cd and td.table_name = 'owner_settled_apply' and td.table_columns = 'state'
        left join owner_settled_rooms osr on t.apply_id = osr.apply_id and osr.status_cd = '0'
        where 1 =1
        <if test="applyId !=null and applyId != ''">
            and t.apply_id= #{applyId}
        </if>

        <if test="applyIds !=null ">
            and t.apply_id in
            <foreach collection="applyIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="createUserId !=null and createUserId != ''">
            and t.create_user_id= #{createUserId}
        </if>
        <if test="ownerNameLike !=null and ownerNameLike != ''">
            and bo.name like concat('%',#{ownerNameLike},'%')
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
@@ -43,6 +57,7 @@
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
        </if>
        group by t.apply_id,t.create_user_id,t.remark,t.state,t.owner_id,t.community_id,t.create_time ,td.name ,bo.`name` ,bo.link
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
@@ -83,13 +98,23 @@
    <select id="queryOwnerSettledApplysCount" parameterType="Map" resultType="Map">
        select count(1) count
        from owner_settled_apply t
        left join building_owner bo on t.owner_id = bo.member_id and bo.status_cd = '0'
        where 1 =1
        <if test="applyId !=null and applyId != ''">
            and t.apply_id= #{applyId}
        </if>
        <if test="applyIds !=null ">
            and t.apply_id in
            <foreach collection="applyIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="createUserId !=null and createUserId != ''">
            and t.create_user_id= #{createUserId}
        </if>
        <if test="ownerNameLike !=null and ownerNameLike != ''">
            and bo.name like concat('%',#{ownerNameLike},'%')
        </if>
        <if test="remark !=null and remark != ''">
            and t.remark= #{remark}
        </if>