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
@@ -357,15 +357,18 @@
    <!-- 查询账期 -->
    <select id="queryBills" parameterType="Map" resultType="Map">
        select
            t.bill_id billId,
            t.bill_name billName,
            t.receivable,
            t.receipts,
            t.bill_time billTime,
            t.community_id communityId,
            t.config_id configId,
            t.cur_bill curBill
        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,
        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}
@@ -410,6 +417,9 @@
        </if>
        <if test="receivable !=null and receivable != ''">
            and t.receivable= #{receivable}
        </if>
        <if test="curReceivable !=null and curReceivable != ''">
            and t.cur_receivable= #{curReceivable}
        </if>
        <if test="receipts !=null">
            and t.receipts= #{receipts}
@@ -432,20 +442,20 @@
    <!-- 查询账期 -->
    <select id="queryBillOweFees" parameterType="Map" resultType="Map">
        select
            t.owe_id oweId,
            t.bill_id billId,
            t.fee_id feeId,
            t.bill_amount_owed billAmountOwed,
            t.amount_owed amountOwed,
            t.fee_end_time feeEndTime,
            t.owner_id ownerId,
            t.owner_name ownerName,
            t.owner_tel ownerTel,
            t.payer_obj_name payerObjName,
            t.payer_obj_type payerObjType,
            t.community_id communityId,
            t.state,
            t.create_time createTime
        t.owe_id oweId,
        t.bill_id billId,
        t.fee_id feeId,
        t.bill_amount_owed billAmountOwed,
        t.amount_owed amountOwed,
        t.fee_end_time feeEndTime,
        t.owner_id ownerId,
        t.owner_name ownerName,
        t.owner_tel ownerTel,
        t.payer_obj_name payerObjName,
        t.payer_obj_type payerObjType,
        t.community_id communityId,
        t.state,
        t.create_time createTime
        from bill_owe_fee t
        where 1 =1
        <if test="oweId !=null and oweId != ''">
@@ -468,6 +478,13 @@
        </if>
        <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}
@@ -522,4 +539,25 @@
    </select>


    <insert id="insertBillOweFees" parameterType="Map">
        INSERT INTO bill_owe_fee
        (`owe_id`, `bill_id`, `fee_id`, `bill_amount_owed`, `amount_owed`, `fee_end_time`, `owner_id`, `owner_name`,
        `owner_tel`, `payer_obj_name`, `payer_obj_type`, `community_id`, `state`)
        VALUES (#{oweId}, #{billId}, #{feeId}, #{billAmountOwed}, #{amountOwed}, #{feeEndTime}, #{ownerId},
        #{ownerName},
        #{ownerTel}, #{payerObjName}, #{payerObjType}, #{communityId}, #{state})
    </insert>

    <insert id="insertBill" parameterType="Map">
        INSERT INTO bill (`bill_id`, `bill_name`, `receivable`, `receipts`, `bill_time`, `community_id`, `config_id`,
       `remark`, `cur_bill`, `cur_receivable`)
        VALUES (#{billId}, #{billName}, #{receivable}, #{receipts}, #{billTime}, #{communityId}, #{configId},
        #{remark}, #{curBill}, #{curReceivable})
    </insert>

    <update id="updateBill" parameterType="Map">
        update bill set cur_bill= 'F' where config_id = #{configId}
    </update>


</mapper>