2025-07-01 bug修改

liyong

6 天以前 fa59bd5bf64f818111b26744a3b51b936ab6f389

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

@@ -7,7 +7,6 @@

    <select id="productRecordPage" resultType="com.ruoyi.purchase.dto.ProductRecordDto">
        SELECT
        distinct
        sl.sales_contract_no,
        sl.customer_contract_no,
        sl.customer_name,
@@ -18,11 +17,10 @@
        tr.invoice_number,
        ROUND(pr.tickets_amount/(1+pr.tax_rate/100),2 ) as un_tickets_price,
        ROUND(pr.tickets_amount-pr.tickets_amount/(1+pr.tax_rate/100),2 )as invoice_amount

        FROM product_record pr
        left join purchase_ledger pl on pl.id = pr.purchase_ledger_id
        left join sales_ledger sl on sl.id = pl.sales_ledger_id
        left join ticket_registration tr on tr.purchase_ledger_id = pl.id
        left join ticket_registration tr on tr.id = pr.ticket_registration_id
        left join product_model pm on pm.id = pr.product_model_id
        WHERE type = 2
        <if test="c.salesContractNo != null and c.salesContractNo != ''">
@@ -32,10 +30,10 @@
            and sl.supplier_name = #{c.supplierName}
        </if>
        <if test="c.createdAtStart != null and c.createdAtStart != ''">
            and pr.created_at &gt;= date_format(#{c.createdAtStart},'%Y-%m-%d')
            and pr.created_at &gt;= date_format(#{c.createdAtStart},'%Y-%m-%d hh:mm:ss')
        </if>
        <if test="c.createdAtEnd != null and c.createdAtEnd != ''">
            and pr.created_at &lt; date_format(#{c.createdAtEnd},'%Y-%m-%d')
            and pr.created_at &lt;= date_format(#{c.createdAtEnd},'%Y-%m-%d hh:mm:ss')
        </if>
    </select>
</mapper>