Merge remote-tracking branch 'origin/master'

zss

15 小时以前 118afd697fe3197236dcf0ffd6cfd39bcec2d85f

 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml

@@ -9,7 +9,7 @@
        SET contract_amount = #{totalTaxInclusiveAmount}
        WHERE id = #{id}
    </update>
    <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.pojo.PurchaseLedger">
    <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
        select
        pl.id,
        pl.purchase_contract_number ,
@@ -20,7 +20,8 @@
        sum(pr.tickets_amount)as receipt_payment_amount,
        pl.contract_amount-sum(pr.tickets_amount) AS unReceipt_payment_amount,
        pl.entry_date,
        pl.recorder_name
        pl.recorder_name,
        pl.payment_method
        from purchase_ledger pl
        left join product_record pr on pl.id = pr.purchase_ledger_id
        <where>
@@ -34,4 +35,23 @@
        pl.contract_amount

    </select>
    <select id="getPaymentRegistrationDtoById" resultType="com.ruoyi.purchase.dto.PaymentRegistrationDto">
        SELECT
            T1.id,
            T1.payment_date,
            T2.supplier_name,
            T1.current_payment_amount,
            T1.payment_method,
            T3.nick_name AS registrant,
            T1.registrationt_date
        FROM
            payment_registration T1
                LEFT JOIN
            supplier_manage T2 ON T1.supplier_id = T2.id
                LEFT JOIN
            sys_user T3 ON T3.user_id = T1.registrant_id
        left join ticket_registration T4 on T1.ticket_registration_id = T4.id
        WHERE
            T4.id = #{id}
    </select>
</mapper>