Merge remote-tracking branch 'origin/master'

chenrui

2025-05-20 1fd5eac12e532a9906e0c1d57676c692c68d1f32

 src/main/resources/mapper/sales/InvoiceRegistrationProductMapper.xml

@@ -4,7 +4,7 @@
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper">

    <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationDto">
    <select id="invoiceRegistrationProductList" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
        SELECT
            id   ,
            sales_ledger_id           ,
@@ -27,7 +27,7 @@
            create_user               ,
            update_time               ,
            update_user               ,
            tenant_id                 ,
            tenant_id
        FROM invoice_registration_product
        <where>
            <if test="invoiceRegistrationProductDto.invoiceRegistrationId != null">
@@ -35,4 +35,48 @@
            </if>
        </where>
    </select>

    <select id="invoiceRegistrationProductPage" resultType="com.ruoyi.sales.dto.InvoiceRegistrationProductDto">
        SELECT
            T1.id   ,
            T1.sales_ledger_id           ,
            T1.sales_ledger_product_id   ,
            T1.invoice_registration_id   ,
            T1.product_category          ,
            T1.specification_model       ,
            T1.unit                      ,
            T1.quantity                  ,
            T1.tax_rate                  ,
            T1.tax_inclusive_unit_price  ,
            T1.tax_inclusive_total_price ,
            T1.tax_exclusive_total_price ,
            T1.invoice_type              ,
            T1.invoice_num               ,
            T1.invoice_amount            ,
            T1.no_invoice_num            ,
            T1.no_invoice_amount         ,
            T1.create_time               ,
            T1.create_user               ,
            T1.update_time               ,
            T1.update_user               ,
            T1.tenant_id,
            T2.sales_contract_no,
            T2.customer_contract_no,
            T2.customer_name,
            T3.invoice_no,
            T3.invoice_total,
            T3.invoice_person,
            T3.invoice_date,
            T4.invoiceFileName
        FROM invoice_registration_product T1
        LEFT JOIN sales_ledger T2 ON T1.sales_ledger_id = T2.id
        LEFT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
        LEFT JOIN (
            SELECT
                invoice_ledger_id,
                GROUP_CONCAT( name ORDER BY id ASC SEPARATOR ' | ') AS invoiceFileName
            FROM invoice_ledger_file GROUP BY invoice_ledger_id
        ) T4 ON T4.invoice_ledger_id = T3.id
        ORDER BY T1.create_time DESC
    </select>
</mapper>