From 33250ae12ae0649010436bcc636e44d6acd6d86b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 15 六月 2026 09:40:57 +0800
Subject: [PATCH] 修改客户，销售，协同，报价，质量
---
src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
index f029331..4898072 100644
--- a/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
+++ b/src/main/resources/mapper/account/sales/AccountSalesCollectionMapper.xml
@@ -20,13 +20,17 @@
</resultMap>
<select id="listPageAccountSalesCollection"
resultType="com.ruoyi.account.bean.vo.sales.AccountSalesCollectionVo">
- select * from (select ascc.*,
+ select
+ A.* ,
+ if(asd.receipt_number is not null, true, false) as isAccountStatemen
+ from (select ascc.*,
c.customer_name,
GROUP_CONCAT(sour.outbound_batches SEPARATOR ',') AS outboundBatches
from account_sales_collection ascc
left join customer c on ascc.customer_id = c.id
left join stock_out_record sour on FIND_IN_SET(sour.id, ascc.stock_out_record_ids) > 0
GROUP BY ascc.id)A
+ left join account_statement_details asd on A.collection_number = asd.receipt_number
<where>
<if test="req.customerId != null">
AND A.customer_id = #{req.customerId}
@@ -41,7 +45,7 @@
AND A.collection_date BETWEEN #{req.startDate} AND #{req.endDate}
</if>
</where>
-
+ order by A.id desc
</select>
<select id="existsByStockOutRecordId" resultType="java.lang.Boolean">
SELECT COUNT(*) > 0
@@ -89,7 +93,7 @@
SELECT DATE_FORMAT(collection_date, #{dateFormat}) AS dateStr,
IFNULL(SUM(collection_amount), 0) AS amount
FROM account_sales_collection
- WHERE collection_date BETWEEN #{startDate} AND #{endDate}
+ WHERE collection_date BETWEEN #{startStr} AND #{endStr}
GROUP BY dateStr
ORDER BY dateStr
</select>
--
Gitblit v1.9.3