From 641206421e76861db238ecf24094b2a04e7c6371 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 26 八月 2026 15:50:26 +0800
Subject: [PATCH] feat(account): 新增付款和回款功能并优化生产计划下发规则
---
src/main/resources/mapper/basic/CustomerMapper.xml | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index ffaff4e..27cf2f4 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -9,9 +9,16 @@
<select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
- u.user_name usage_user_name,
+ <choose>
+ <when test="isAdmin">
+ u.nick_name usage_user_name,
+ </when>
+ <otherwise>
+ CASE WHEN c.usage_user = #{loginUserId} OR c.create_user = #{loginUserId} THEN u.nick_name ELSE '' END as usage_user_name,
+ </otherwise>
+ </choose>
(
- select group_concat(u2.user_name separator ', ')
+ select group_concat(u2.nick_name separator ', ')
from customer_user cu
left join sys_user u2 on cu.user_id = u2.user_id
where cu.customer_id = c.id
@@ -65,9 +72,16 @@
<select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
- u.user_name usage_user_name,
+ <choose>
+ <when test="isAdmin">
+ u.nick_name usage_user_name,
+ </when>
+ <otherwise>
+ CASE WHEN c.usage_user = #{loginUserId} OR c.create_user = #{loginUserId} THEN u.nick_name ELSE '' END as usage_user_name,
+ </otherwise>
+ </choose>
(
- select group_concat(u2.user_name separator ', ')
+ select group_concat(u2.nick_name separator ', ')
from customer_user cu
left join sys_user u2 on cu.user_id = u2.user_id
where cu.customer_id = c.id
@@ -163,14 +177,20 @@
left join (
select
sl.id,
- sum(ascc.collection_amount) as receiptPaymentAmount
- from account_sales_collection ascc
- left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
- left join shipping_info s on sor.record_id = s.id
- LEFT JOIN sales_ledger sl ON s.sales_ledger_id = sl.id
- WHERE sor.record_type='13'
- and sor.approval_status=1
- group by sl.id
+ sum(t.collection_amount) as receiptPaymentAmount
+ from (
+ select
+ ascc.collection_amount,
+ s.sales_ledger_id
+ from account_sales_collection ascc
+ left join stock_out_record sor on FIND_IN_SET(sor.id, ascc.stock_out_record_ids) > 0
+ left join shipping_info s on sor.record_id = s.id
+ where sor.record_type='13'
+ and sor.approval_status=1
+ group by ascc.id, s.sales_ledger_id
+ ) t
+ left join sales_ledger sl on t.sales_ledger_id = sl.id
+ group by sl.id
)T1 on T1.id = sl.id
left join (
select sl.id,
--
Gitblit v1.9.3