From b2f8320707dc72b2429bfb4fe0b317c11b1e5b7f Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 29 十月 2026 16:34:45 +0800
Subject: [PATCH] change

---
 src/main/resources/mapper/basic/CustomerMapper.xml |   60 +++++++++++++++++++-----------------------------------------
 1 files changed, 19 insertions(+), 41 deletions(-)

diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 442173e..f05c22d 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -9,9 +9,9 @@
     <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
         select
         c.*,
-        u.user_name usage_user_name,
+        ifnull(u.nick_name, u.user_name) usage_user_name,
         (
-        select group_concat(u2.user_name separator ', ')
+        select group_concat(ifnull(u2.nick_name, u2.user_name) separator ', ')
         from customer_user cu
         left join sys_user u2 on cu.user_id = u2.user_id
         where cu.customer_id = c.id
@@ -45,8 +45,9 @@
             </if>
             <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
             <if test="c.type != null and c.type == 0">
-                and (
-                    (type = #{c.type} or (type = 1 and is_assigned = 1))
+                and (type = #{c.type} or (type = 1 and is_assigned = 1))
+                <!-- loginUserId 涓虹┖琛ㄧず瓒呯骇绠$悊鍛橈紝涓嶅彈棰嗙敤/鍏变韩鑼冨洿闄愬埗 -->
+                <if test="loginUserId != null">
                     and (
                         c.usage_user = #{loginUserId}
                         or c.create_user = #{loginUserId}
@@ -56,7 +57,7 @@
                             and cu.user_id = #{loginUserId}
                         )
                     )
-                )
+                </if>
             </if>
         </where>
         order by c.id desc
@@ -65,9 +66,9 @@
     <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
         select
         c.*,
-        u.user_name usage_user_name,
+        ifnull(u.nick_name, u.user_name) usage_user_name,
         (
-        select group_concat(u2.user_name separator ', ')
+        select group_concat(ifnull(u2.nick_name, u2.user_name) separator ', ')
         from customer_user cu
         left join sys_user u2 on cu.user_id = u2.user_id
         where cu.customer_id = c.id
@@ -107,8 +108,9 @@
             </if>
             <!-- 绉佹捣鏌ヨ锛歵ype = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴� -->
             <if test="c.type != null and c.type == 0">
-                and (
-                    (type = #{c.type} or (type = 1 and is_assigned = 1))
+                and (type = #{c.type} or (type = 1 and is_assigned = 1))
+                <!-- loginUserId 涓虹┖琛ㄧず瓒呯骇绠$悊鍛橈紝涓嶅彈棰嗙敤/鍏变韩鑼冨洿闄愬埗 -->
+                <if test="loginUserId != null">
                     and (
                         c.usage_user = #{loginUserId}
                         or c.create_user = #{loginUserId}
@@ -118,7 +120,7 @@
                             and cu.user_id = #{loginUserId}
                         )
                     )
-                )
+                </if>
             </if>
         </where>
         order by c.id desc
@@ -126,24 +128,12 @@
     <select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
         select T1.customer_id,
                c.customer_name,
-               T1.contractAmounts - IFNULL(T4.returnAmount, 0) AS contractAmounts,
+               T1.contractAmounts AS contractAmounts,
                IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
-               IFNULL(T3.outboundAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount
+               T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
+               IFNULL(T4.returnAmount, 0) AS returnAmount
         from (select customer_id, sum(contract_amount) as contractAmounts from sales_ledger group by customer_id) T1
         left join (select customer_id, sum(collection_amount) as receiptPaymentAmount from account_sales_collection group by customer_id) T2 on T1.customer_id = T2.customer_id
-        left join (
-            SELECT
-                sl.customer_id,
-                sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
-            FROM stock_out_record sor
-            LEFT join shipping_info s on sor.record_id = s.id
-            LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
-            LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
-            WHERE sor.record_type='13'
-                and sor.approval_status=1
-                and slp.type = 1
-            group by sl.customer_id
-        ) T3 on T3.customer_id=T1.customer_id
         left join (
             select
                 sl.customer_id,
@@ -154,7 +144,7 @@
             where rm.status=1
             group by sl.customer_id
         ) T4 on T4.customer_id=T1.customer_id
-        left join customer c on T1.customer_id = c.id
+        inner join customer c on T1.customer_id = c.id
         <where>
             <if test="customerName!=null and customerName!=''">
                 AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
@@ -167,9 +157,10 @@
         select sl.id salesLedgerId,
                sl.sales_contract_no,
                sl.execution_date,
-               sl.contract_amount - IFNULL(T3.returnAmount, 0) AS contract_amount,
+               sl.contract_amount AS contract_amount,
                IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
-               IFNULL(T2.outboundAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount
+               sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
+               IFNULL(T3.returnAmount, 0) AS returnAmount
         from sales_ledger sl
         left join (
             select
@@ -183,19 +174,6 @@
               and sor.approval_status=1
             group by  sl.id
         )T1 on T1.id = sl.id
-        left join (
-            SELECT
-                sl.id,
-                sum(sor.stock_out_num * slp.tax_inclusive_unit_price) as outboundAmount
-            FROM stock_out_record sor
-                     left join shipping_info s on sor.record_id = s.id
-                     LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
-                     LEFT JOIN sales_ledger_product slp ON s.sales_ledger_product_id = slp.id
-            WHERE sor.record_type='13'
-              and sor.approval_status=1
-              and slp.type = 1
-            group by  sl.id
-        )T2 on T2.id = sl.id
         left join (
             select sl.id,
                    sum(rm.refund_amount) as returnAmount

--
Gitblit v1.9.3