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

maven

4 小时以前 8e14fa84f6f2dfdda8a739400fca80ac73dca874

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

 src/main/java/com/ruoyi/purchase/service/impl/PaymentRegistrationServiceImpl.java

@@ -220,10 +220,10 @@
                            new QueryWrapper<SalesLedgerProduct>().eq("sales_ledger_id", id).eq("type",2)
                    ).stream())
                    .collect(Collectors.toList());
            payableAmount = salesLedgerProducts.stream()
                    .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);
//            payableAmount = salesLedgerProducts.stream()
//                    .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
//                    .filter(Objects::nonNull)
//                    .reduce(BigDecimal.ZERO, BigDecimal::add);

            // 来票金额计算
            List<TicketRegistration> ticketRegistrations = purchaseLedgers.stream()
@@ -247,6 +247,11 @@
                    .map(PaymentRegistration::getCurrentPaymentAmount)
                    .filter(Objects::nonNull)
                    .reduce(BigDecimal.ZERO, BigDecimal::add);

            // 核心过滤逻辑：当paymentAmount和invoiceAmount同时为0时，跳过该记录
            if (BigDecimal.ZERO.compareTo(paymentAmount) == 0 && BigDecimal.ZERO.compareTo(invoiceAmount) == 0) {
                continue; // 跳过当前供应商，不加入结果集
            }

            // 详情分页处理
            detailPageNum = detailPageNum != null ? detailPageNum : 1;
@@ -301,6 +306,8 @@
            result.add(res);
        }

        // 修正总条数：过滤后需要重新计算总条数
        resultPage.setTotal(result.size());
        resultPage.setRecords(result);
        return resultPage;
    }

 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.sales_contract_no as customerContractNo,
        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
        pl.id
        HAVING
        customerContractNo 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 *