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

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

 java110-db/src/main/resources/mapper/fee/AccountReceiptV1ServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
    <!-- 保存预存单信息 add by wuxw 2018-07-03 -->
    <insert id="saveAccountReceiptInfo" parameterType="Map">
        insert into account_receipt(
        ar_id,owner_name,prime_rate,link,acct_id,receivable_amount,received_amount,community_id,owner_id
        ar_id,owner_name,prime_rate,link,acct_id,receivable_amount,received_amount,community_id,owner_id,remark
        ) values (
        #{arId},#{ownerName},#{primeRate},#{link},#{acctId},#{receivableAmount},#{receivedAmount},#{communityId},#{ownerId}
        #{arId},#{ownerName},#{primeRate},#{link},#{acctId},#{receivableAmount},#{receivedAmount},#{communityId},#{ownerId},#{remark}
        )
    </insert>

@@ -20,12 +20,23 @@
        select t.ar_id,t.ar_id arId,t.owner_name,t.owner_name ownerName,t.prime_rate,t.prime_rate
        primeRate,t.link,t.acct_id,t.acct_id acctId,t.receivable_amount,t.receivable_amount
        receivableAmount,t.received_amount,t.received_amount receivedAmount,t.community_id,t.community_id
        communityId,t.owner_id,t.owner_id ownerId
        communityId,t.owner_id,t.owner_id ownerId,t.remark,act.acct_name acctName,act.acct_type acctType,act.amount,
        td.name primeRateName,td1.name acctTypeName,t.create_time createTime
        from account_receipt t
        left join account act on t.acct_id = act.acct_id and act.status_cd = '0'
        left join t_dict td on t.prime_rate = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'prime_rate'
        left join t_dict td1 on act.acct_type = td1.status_cd and td1.table_name = 'account' and td1.table_columns = 'acct_type'
        where 1 =1
        <if test="arId !=null and arId != ''">
            and t.ar_id= #{arId}
        </if>
        <if test="arIds != null">
            and t.ar_id in
            <foreach collection="arIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="ownerName !=null and ownerName != ''">
            and t.owner_name= #{ownerName}
        </if>
@@ -103,6 +114,12 @@
        <if test="arId !=null and arId != ''">
            and t.ar_id= #{arId}
        </if>
        <if test="arIds != null">
            and t.ar_id in
            <foreach collection="arIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="ownerName !=null and ownerName != ''">
            and t.owner_name= #{ownerName}
        </if>