Merge branch 'master' of https://github.com/java110/MicroCommunity

java110

2020-08-01 57cbb7df3dcd52707c8d284ecc035bafb190312d

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

@@ -139,7 +139,7 @@
        pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
        computingFormula,
        t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
        configStartTime,pfc.end_time configEndTime
        configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle
        from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3
        where 1 =1
        and t.fee_type_cd = pfc.fee_type_cd
@@ -360,12 +360,15 @@
        t.bill_id billId,
        t.bill_name billName,
        t.receivable,
        t.cur_receivable curReceivable,
        t.receipts,
        t.bill_time billTime,
        t.community_id communityId,
        t.config_id configId,
        t.cur_bill curBill
        t.cur_bill curBill,
        c.fee_name feeName
        from bill t
        left join  pay_fee_config c on t.config_id = c.config_id and c.community_id = t.community_id and c.status_cd = '0'
        where 1 =1
        <if test="billId !=null and billId != ''">
            and t.bill_id= #{billId}
@@ -381,6 +384,9 @@
        </if>
        <if test="billTime !=null">
            and t.bill_time= #{billTime}
        </if>
        <if test="curBillTime !=null">
            and t.bill_time &gt; #{curBillTime}
        </if>
        <if test="communityId !=null and communityId != ''">
            and t.community_id= #{communityId}
@@ -401,6 +407,7 @@
    <select id="queryBillCount" parameterType="Map" resultType="Map">
        select count(1) count
        from bill t
        left join  pay_fee_config c on t.config_id = c.config_id and c.community_id = t.community_id and c.status_cd = '0'
        where 1 =1
        <if test="billId !=null and billId != ''">
            and t.bill_id= #{billId}
@@ -472,6 +479,13 @@
        <if test="ownerId != null and ownerId != ''">
            and t.owner_id = #{ownerId}
        </if>
        <if test="ownerIds !=null">
            and t.owner_id in
            <foreach collection="ownerIds" open="(" close=")"
                     separator=","  item="item">
                #{item}
            </foreach>
        </if>
        <if test="ownerName != null and ownerName != ''">
            and t.owner_name = #{ownerName}
        </if>