Merge remote-tracking branch 'origin/master'

zss

3 天以前 aab9f74b97df038154d507b6d17b6f96a8337efc

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

@@ -9,4 +9,30 @@
        SET contract_amount = #{totalTaxInclusiveAmount}
        WHERE id = #{id}
    </update>
    <select id="selectPurchaseLedgerListPage" resultType="com.ruoyi.purchase.dto.PurchaseLedgerDto">
        select
        pl.id,
        pl.purchase_contract_number ,
        pl.sales_contract_no,
        pl.supplier_name,
        pl.project_name,
        pl.contract_amount,
        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.payment_method
        from purchase_ledger pl
        left join product_record pr on pl.id = pr.purchase_ledger_id
        <where>
            <if test="c.purchaseContractNumber != null and c.purchaseContractNumber != ''">
                pl.purchase_contract_number like concat('%',#{c.purchaseContractNumber},'%')
            </if>
        </where>
        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
        pl.project_name,pl.entry_date,
        pl.recorder_name,
        pl.contract_amount

    </select>
</mapper>