From dd51f856dc7eb6255a5e927c47fa35281216f315 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 18:37:23 +0800
Subject: [PATCH] yys
---
src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml | 40 +++++++++++++++++++---------------------
1 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
index 3d91391..96e0388 100644
--- a/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
+++ b/src/main/resources/mapper/purchase/InvoicePurchaseMapper.xml
@@ -6,31 +6,29 @@
<select id="selectPurchaseReport" resultType="com.ruoyi.purchase.dto.InvoicePurchaseReportDto">
- select A.*,
- FORMAT(A.contract_amount-A.sale_tax_exclusive_total_price-A.purchase_amount+A.tax_exclusive_total_price,2) as balance_amount
- from (select sl.customer_contract_no,
- sl.id,
- pl.id as pl_id,
+ SELECT
+ sl.sales_contract_no AS customerContractNo,
sl.customer_name,
+ sl.contract_amount AS contract_amount,
sl.project_name,
- sl.contract_amount,
- pl.contract_amount as purchase_amount,
- sum(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,
- (sl.contract_amount - pl.contract_amount) as balance,
- CONCAT(FORMAT((sl.contract_amount - pl.contract_amount) / sl.contract_amount * 100, 2),
- '%') 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.contract_amount, pl.contract_amount,sl.id,pl.id
- having sl.customer_contract_no is not null) A
+ 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
+ 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 sl.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 *
@@ -112,7 +110,7 @@
)as a
<where>
<if test="month != null">
- and a.month = date_format(#{month})
+ and a.month = #{month}
</if>
</where>
@@ -143,4 +141,4 @@
# GROUP BY DATE_FORMAT(a.issue_date, '%Y-%m')
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3