Merge remote-tracking branch 'origin/sqd' into sqd

maven

3 天以前 83a2ac0bbf44d550a4d0add970d14623298a8574

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

@@ -87,13 +87,15 @@
            T2.customer_contract_no,
            T2.customer_name,
            T3.invoice_no,
            T3.id as invoice_ledger_id,
            IFNULL(T3.invoice_total,0) AS invoice_total,
            T3.invoice_person,
            T3.invoice_date,
            T4.invoiceFileName
            T4.invoiceFileName,
            T2.project_name
        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
        RIGHT JOIN invoice_ledger T3 ON T1.id = T3.invoice_registration_product_id
        LEFT JOIN (
            SELECT
                invoice_ledger_id,
@@ -107,8 +109,14 @@
                     T2.customer_name LIKE CONCAT('%',#{invoiceRegistrationProductDto.searchText},'%')
                     )
            </if>
            <if test="invoiceRegistrationProductDto.invoiceDate != null">
                AND T3.invoice_date = #{invoiceRegistrationProductDto.invoiceDate}
            <if test="invoiceRegistrationProductDto.invoiceDateStart != null and invoiceRegistrationProductDto.invoiceDateStart != ''">
                AND T3.invoice_date &gt;= date_format(#{invoiceRegistrationProductDto.invoiceDateStart}, '%Y-%m-%d')
            </if>
            <if test="invoiceRegistrationProductDto.invoiceDateEnd != null and invoiceRegistrationProductDto.invoiceDateEnd != ''">
                AND T3.invoice_date &lt;= date_format(#{invoiceRegistrationProductDto.invoiceDateEnd}, '%Y-%m-%d')
            </if>
            <if test="invoiceRegistrationProductDto.createTimeStart != null ">
                AND T1.create_time like CONCAT(#{invoiceRegistrationProductDto.createTimeStart}, '%')
            </if>
        </where>
        ORDER BY T1.create_time DESC