From e40a608ef9bf51db294d8eefada6a8e2e80cebca Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 15 十月 2026 16:03:27 +0800
Subject: [PATCH] fix(mdm): 物料列表改按物料编码排序
---
yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml b/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
index dc10f12..0b2b704 100644
--- a/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
+++ b/yudao-module-crm/src/main/resources/mapper/statistics/CrmStatisticsCustomerMapper.xml
@@ -179,8 +179,10 @@
IFNULL(receivable.price, 0) AS receivable_price
FROM crm_customer AS customer
INNER JOIN crm_contract AS contract ON customer.id = contract.customer_id
- LEFT JOIN crm_receivable AS receivable ON contract.id = receivable.contract_id
- WHERE customer.deleted = 0 AND contract.deleted = 0 AND receivable.deleted = 0
+ <!-- receivable.deleted = 0 蹇呴』鍐欏湪 ON 閲岋細鍐欏埌 WHERE 閲屼細璁� LEFT JOIN 閫�鍖栨垚 INNER JOIN锛�
+ 娌℃湁鍥炴璁板綍鐨勫悎鍚屼細琚暣琛屼涪鎺夛紙鎴愪氦 6 涓鎴枫�佽浆鍖栬〃鍙嚭鐜� 4 涓級 -->
+ LEFT JOIN crm_receivable AS receivable ON contract.id = receivable.contract_id AND receivable.deleted = 0
+ WHERE customer.deleted = 0 AND contract.deleted = 0
AND contract.audit_status = ${@cn.iocoder.yudao.module.crm.enums.common.CrmAuditStatusEnum@APPROVE.status}
AND customer.owner_user_id IN
<foreach collection="userIds" item="userId" open="(" close=")" separator=",">
@@ -249,7 +251,7 @@
FROM crm_customer AS customer
LEFT JOIN crm_contract AS contract ON customer.id = contract.customer_id
LEFT JOIN crm_contract_product AS contract_product ON contract_product.contract_id = contract.id
- LEFT JOIN crm_product AS product ON contract_product.product_id = product.id
+ LEFT JOIN mdm_item AS product ON contract_product.item_id = product.id
WHERE customer.deleted = 0
AND contract.deleted = 0
AND contract_product.deleted = 0
@@ -260,7 +262,7 @@
#{userId}
</foreach>
AND customer.create_time BETWEEN #{times[0],javaType=java.time.LocalDateTime} AND #{times[1],javaType=java.time.LocalDateTime}
- GROUP BY product.id
+ GROUP BY product.id, product.name
</select>
</mapper>
--
Gitblit v1.9.3