yys 修改项目利润，供应商往来

maven

19 小时以前 8e14fa84f6f2dfdda8a739400fca80ac73dca874

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

@@ -7,49 +7,27 @@

    <select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
        SELECT
        A.*,
        FORMAT(A.sales_tax_amount - A.purchase_tax_amount, 2) AS balance_amount
        FROM (
        SELECT
        sl.customer_contract_no,
        sl.id,
        pl.id AS pl_id,
        sl.sales_contract_no AS customerContractNo,
        sl.customer_name,
        sl.project_name,
        slp.tax_inclusive_total_price - slp.tax_exclusive_total_price AS contract_amount,
        SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_amount,
        (slp.tax_exclusive_total_price) / COUNT(slp.id) AS sale_tax_exclusive_total_price,
        SUM(slp1.tax_exclusive_total_price) AS tax_exclusive_total_price,
        (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
        SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS balance,
        CONCAT(
        FORMAT(
        ((slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) -
        SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price)) /
        (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) * 100,
        2),
        '%'
        ) AS balance_ratio,
        (slp.tax_inclusive_total_price - slp.tax_exclusive_total_price) AS sales_tax_amount,
        SUM(slp1.tax_inclusive_total_price - slp1.tax_exclusive_total_price) AS purchase_tax_amount
        sl.contract_amount AS contract_amount,
        SUM( pl.contract_amount ) AS purchase_amount,
        (
        sl.contract_amount - SUM( pl.contract_amount )) AS balance,
        CONCAT( ROUND( ( sl.contract_amount - SUM( pl.contract_amount )) / sl.contract_amount * 100, 1 ), '%' ) AS balance_ratio
        FROM
        purchase_ledger pl
        LEFT JOIN
        sales_ledger sl ON pl.sales_ledger_id = sl.id
        LEFT JOIN
        sales_ledger_product slp ON slp.sales_ledger_id = sl.id AND slp.type = 1
        LEFT JOIN
        sales_ledger_product slp1 ON slp1.sales_ledger_id = pl.id AND slp1.type = 2
        GROUP BY
        sl.customer_contract_no, sl.customer_name, sl.project_name, sl.id, pl.id
        HAVING
        sl.customer_contract_no IS NOT NULL
        ) A
        sales_ledger sl
        INNER JOIN purchase_ledger pl ON sl.sales_contract_no = pl.sales_contract_no
        <where>
            <if test="c.customerName != null and c.customerName != ''">
                AND A.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
                AND sl.customer_name LIKE CONCAT('%', #{c.customerName}, '%')
            </if>
        </where>
        GROUP BY
        sl.sales_contract_no,
        sl.customer_name,
        sl.contract_amount
        ORDER BY
        sl.sales_contract_no;
    </select>
    <select id="listVat" resultType="com.ruoyi.purchase.dto.VatDto">
        select *
@@ -66,6 +44,7 @@
                                LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
                       WHERE il.invoice_no IS NOT NULL
                         AND invoice_type = '增专票'
                         AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL  -- 新增：过滤month为NULL的情
                       GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
                   ) a1
                       LEFT JOIN (
@@ -124,12 +103,14 @@
                           LEFT JOIN invoice_registration_product pr ON pr.id = il.invoice_registration_product_id
                  WHERE il.invoice_no IS NOT NULL
                    AND invoice_type = '增专票'
                    AND DATE_FORMAT(il.invoice_date, '%Y-%m') IS NOT NULL  -- 新增：过滤month为NULL的情
                  GROUP BY DATE_FORMAT(il.invoice_date, '%Y-%m')
              ) a1 ON a1.month = a2.month
              WHERE a1.month IS NULL
              ORDER BY month
             )as a
        <where>
            a.month is not null
            <if test="month != null">
                and a.month = #{month}
            </if>