From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/resources/mapper/basic/CustomerMapper.xml | 353 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 347 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerMapper.xml b/src/main/resources/mapper/basic/CustomerMapper.xml
index 3b42238..93c7612 100644
--- a/src/main/resources/mapper/basic/CustomerMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerMapper.xml
@@ -6,17 +6,30 @@
<resultMap id="BaseResultMap" type="com.ruoyi.basic.pojo.Customer">
<id column="id" property="id" />
</resultMap>
- <select id="listPage" resultType="com.ruoyi.basic.dto.CustomerDto">
+ <select id="listPage" resultType="com.ruoyi.basic.vo.CustomerVo">
select
c.*,
u.user_name usage_user_name,
(
select group_concat(u2.user_name separator ', ')
- from customer_private_pool cpp2
- left join sys_user u2 on cpp2.bound_id = u2.user_id
- where cpp2.customer_id = c.id and cpp2.delete_flag = 0
- and cpp2.bound_id != c.usage_user
- ) as together_user_names
+ from customer_user cu
+ left join sys_user u2 on cu.user_id = u2.user_id
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str,
+ CASE
+ WHEN EXISTS (SELECT 1 FROM sales_ledger sl WHERE sl.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM sales_quotation sq WHERE sq.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM return_management rm WHERE rm.customer_id = c.id)
+ THEN 1
+ ELSE 0
+ END AS sales_reference_flag
from customer c
left join sys_user u on c.usage_user = u.user_id
<where>
@@ -26,8 +39,336 @@
<if test="c.customerType != null and c.customerType != ''">
and customer_type = #{c.customerType}
</if>
+ <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+ <if test="c.type != null and c.type == 1">
+ and type = #{c.type}
+ </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 (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
</where>
+ order by c.id desc
</select>
+ <select id="list" resultType="com.ruoyi.basic.vo.CustomerVo">
+ select
+ c.*,
+ u.user_name usage_user_name,
+ (
+ select group_concat(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
+ and cu.user_id != c.usage_user
+ ) as together_user_names,
+ (
+ select group_concat(cu.user_id separator ',')
+ from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id != c.usage_user
+ ) as user_ids_str,
+ CASE
+ WHEN EXISTS (SELECT 1 FROM sales_ledger sl WHERE sl.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM sales_quotation sq WHERE sq.customer_id = c.id)
+ OR EXISTS (SELECT 1 FROM return_management rm WHERE rm.customer_id = c.id)
+ THEN 1
+ ELSE 0
+ END AS sales_reference_flag
+ from customer c
+ left join sys_user u on c.usage_user = u.user_id
+ <where>
+ <if test="c.ids != null and c.ids.length > 0">
+ and c.id in
+ <foreach collection="c.ids" item="id" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ <if test="c.customerName != null and c.customerName != ''">
+ and customer_name like concat('%', #{c.customerName}, '%')
+ </if>
+ <if test="c.customerType != null and c.customerType != ''">
+ and customer_type = #{c.customerType}
+ </if>
+ <!-- 鍏捣鏌ヨ锛歵ype = 1锛堝叕娴峰鎴凤級-->
+ <if test="c.type != null and c.type == 1">
+ and type = #{c.type}
+ </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 (
+ c.usage_user = #{loginUserId}
+ or c.create_user = #{loginUserId}
+ or exists (
+ select 1 from customer_user cu
+ where cu.customer_id = c.id
+ and cu.user_id = #{loginUserId}
+ )
+ )
+ )
+ </if>
+ </where>
+ order by c.id desc
+ </select>
+ <select id="projectTransactions" resultType="com.ruoyi.sales.vo.ProjectTransactionsVo">
+ select T1.project_id AS projectId,
+ IFNULL(p.title, '鏈垎绫�') AS projectName,
+ p.no AS projectNo,
+ p.status AS status,
+ T1.contractAmounts AS contractAmounts,
+ IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
+ IFNULL(T4.returnAmount, 0) AS returnAmount,
+ IFNULL(T5.invoiceAmount, 0) AS invoiceAmount,
+ IFNULL(T6.contractCount, 0) AS contractCount,
+ IFNULL(T6.customerCount, 0) AS customerCount,
+ IFNULL(T6.overdueCount, 0) AS overdueCount
+ from (select IFNULL(project_id, -1) as project_id, sum(contract_amount) as contractAmounts from sales_ledger group by IFNULL(project_id, -1)) T1
+ left join project_management_info p on T1.project_id = p.id
+ left join (
+ select
+ IFNULL(sl.project_id, -1) as project_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 IFNULL(sl.project_id, -1)
+ ) T2 on T1.project_id = T2.project_id
+ left join (
+ select
+ IFNULL(sl.project_id, -1) as project_id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by IFNULL(sl.project_id, -1)
+ ) T4 on T4.project_id = T1.project_id
+ left join (
+ select
+ IFNULL(sl.project_id, -1) as project_id,
+ sum(asi.tax_inclusive_price) as invoiceAmount
+ from account_sales_invoice asi
+ left join account_invoice_application aia on asi.account_invoice_application_id = aia.id
+ left join stock_out_record sor on FIND_IN_SET(sor.id, aia.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 asi.status=0
+ group by IFNULL(sl.project_id, -1)
+ ) T5 on T5.project_id = T1.project_id
+ left join (
+ select IFNULL(sl.project_id, -1) as project_id,
+ count(sl.id) as contractCount,
+ count(distinct sl.customer_id) as customerCount,
+ sum(case when DATEDIFF(NOW(), sl.execution_date) > 30 and IFNULL(T1_rcpt.receiptPaymentAmount, 0) < sl.contract_amount then 1 else 0 end) as overdueCount
+ from sales_ledger sl
+ left join (
+ select sl_in.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_in ON s.sales_ledger_id = sl_in.id
+ WHERE sor.record_type='13' and sor.approval_status=1
+ group by sl_in.id
+ ) T1_rcpt on T1_rcpt.id = sl.id
+ group by IFNULL(sl.project_id, -1)
+ ) T6 on T6.project_id = T1.project_id
+ <where>
+ <if test="projectName!=null and projectName!=''">
+ AND IFNULL(p.title, '鏈垎绫�') LIKE CONCAT('%', #{projectName}, '%')
+ </if>
+ <if test="customerName!=null and customerName!=''">
+ AND EXISTS (
+ select 1 from sales_ledger sl2
+ left join customer c on sl2.customer_id = c.id
+ where IFNULL(sl2.project_id, -1) = T1.project_id
+ and c.customer_name like concat('%', #{customerName}, '%')
+ )
+ </if>
+ <if test="contractName!=null and contractName!=''">
+ AND EXISTS (
+ select 1 from sales_ledger sl3
+ where IFNULL(sl3.project_id, -1) = T1.project_id
+ and sl3.sales_contract_no like concat('%', #{contractName}, '%')
+ )
+ </if>
+ </where>
+ order by CASE WHEN T1.project_id = -1 THEN 1 ELSE 0 END DESC, T1.project_id desc
+ </select>
+ <select id="customewTransactions" resultType="com.ruoyi.sales.vo.CustomerTransactionsVo">
+ select T1.customer_id,
+ T1.project_id AS projectId,
+ c.customer_name,
+ T1.contractAmounts AS contractAmounts,
+ IFNULL(T2.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ T1.contractAmounts - IFNULL(T2.receiptPaymentAmount, 0) - IFNULL(T4.returnAmount, 0) AS receiptableAmount,
+ IFNULL(T4.returnAmount, 0) AS returnAmount,
+ IFNULL(T5.invoiceAmount, 0) AS invoiceAmount,
+ IFNULL(T6.contractCount, 0) AS contractCount,
+ IFNULL(T6.overdueCount, 0) AS overdueCount
+ from (
+ select customer_id, IFNULL(project_id, -1) as project_id, sum(contract_amount) as contractAmounts
+ from sales_ledger
+ <where>
+ <if test="projectId!=null">
+ and IFNULL(project_id, -1) = #{projectId}
+ </if>
+ </where>
+ group by customer_id, IFNULL(project_id, -1)
+ ) T1
+ left join (
+ select
+ sl.customer_id, IFNULL(sl.project_id, -1) as project_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.customer_id, IFNULL(sl.project_id, -1)
+ ) T2 on T1.customer_id = T2.customer_id and T1.project_id = T2.project_id
+ left join (
+ select
+ sl.customer_id, IFNULL(sl.project_id, -1) as project_id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by sl.customer_id, IFNULL(sl.project_id, -1)
+ ) T4 on T4.customer_id = T1.customer_id and T4.project_id = T1.project_id
+ left join (
+ select
+ sl.customer_id, IFNULL(sl.project_id, -1) as project_id,
+ sum(asi.tax_inclusive_price) as invoiceAmount
+ from account_sales_invoice asi
+ left join account_invoice_application aia on asi.account_invoice_application_id = aia.id
+ left join stock_out_record sor on FIND_IN_SET(sor.id, aia.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 asi.status=0
+ group by sl.customer_id, IFNULL(sl.project_id, -1)
+ ) T5 on T5.customer_id = T1.customer_id and T5.project_id = T1.project_id
+ left join (
+ select sl.customer_id, IFNULL(sl.project_id, -1) as project_id,
+ count(sl.id) as contractCount,
+ sum(case when DATEDIFF(NOW(), sl.execution_date) > 30 and IFNULL(T1_rcpt.receiptPaymentAmount, 0) < sl.contract_amount then 1 else 0 end) as overdueCount
+ from sales_ledger sl
+ left join (
+ select sl_in.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_in ON s.sales_ledger_id = sl_in.id
+ WHERE sor.record_type='13' and sor.approval_status=1
+ group by sl_in.id
+ ) T1_rcpt on T1_rcpt.id = sl.id
+ group by sl.customer_id, IFNULL(sl.project_id, -1)
+ ) T6 on T6.customer_id = T1.customer_id and T6.project_id = T1.project_id
+ left join customer c on T1.customer_id = c.id
+ <where>
+ <if test="customerName!=null and customerName!=''">
+ AND c.customer_name LIKE CONCAT('%', #{customerName}, '%')
+ </if>
+ <if test="contractName!=null and contractName!=''">
+ AND EXISTS (
+ select 1 from sales_ledger sl3
+ where sl3.customer_id = T1.customer_id
+ and IFNULL(sl3.project_id, -1) = T1.project_id
+ and sl3.sales_contract_no like concat('%', #{contractName}, '%')
+ )
+ </if>
+ </where>
+ order by T1.customer_id desc
+ </select>
+ <select id="customewTransactionsDetails"
+ resultType="com.ruoyi.sales.vo.CustomerTransactionsDetailsVo">
+ select sl.id salesLedgerId,
+ sl.sales_contract_no,
+ sl.execution_date,
+ sl.contract_amount AS contract_amount,
+ IFNULL(T1.receiptPaymentAmount, 0) AS receiptPaymentAmount,
+ sl.contract_amount - IFNULL(T1.receiptPaymentAmount, 0) - IFNULL(T3.returnAmount, 0) AS receiptableAmount,
+ IFNULL(T3.returnAmount, 0) AS returnAmount,
+ IFNULL(T5.invoiceAmount, 0) AS invoiceAmount,
+ CASE
+ WHEN DATEDIFF(NOW(), sl.execution_date) > 30 AND IFNULL(T1.receiptPaymentAmount, 0) < sl.contract_amount THEN 1
+ ELSE 0
+ END AS isPaymentTimeout
+ from sales_ledger sl
+ 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
+ )T1 on T1.id = sl.id
+ left join (
+ select sl.id,
+ sum(rm.refund_amount) as returnAmount
+ from return_management rm
+ left join shipping_info si on rm.shipping_id = si.id
+ left join sales_ledger sl on si.sales_ledger_id = sl.id
+ where rm.status=1
+ group by sl.id
+ )T3 on T3.id = sl.id
+ left join (
+ select
+ sl.id,
+ sum(asi.tax_inclusive_price) as invoiceAmount
+ from account_sales_invoice asi
+ left join account_invoice_application aia on asi.account_invoice_application_id = aia.id
+ left join stock_out_record sor on FIND_IN_SET(sor.id, aia.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 asi.status=0
+ group by sl.id
+ ) T5 on T5.id = sl.id
+ where sl.customer_id = #{customerId}
+ <if test="projectId!=null">
+ and IFNULL(sl.project_id, -1) = #{projectId}
+ </if>
+ <if test="contractName!=null and contractName!=''">
+ and sl.sales_contract_no like concat('%', #{contractName}, '%')
+ </if>
+ order by sl.id desc
+ </select>
+ <select id="transactionsSummary" resultType="java.util.Map">
+ select count(distinct IFNULL(sl.project_id, -1)) as totalProjects,
+ count(distinct sl.customer_id) as totalCustomers,
+ count(sl.id) as totalContracts,
+ IFNULL(sum(sl.contract_amount), 0) as totalAmount,
+ IFNULL(sum(case when DATEDIFF(NOW(), sl.execution_date) > 30 and IFNULL(rcpt.receiptPaymentAmount, 0) < sl.contract_amount then 1 else 0 end), 0) as totalOverdueCount
+ from sales_ledger sl
+ left join (
+ select sl_in.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_in ON s.sales_ledger_id = sl_in.id
+ WHERE sor.record_type='13' and sor.approval_status=1
+ group by sl_in.id
+ ) rcpt on rcpt.id = sl.id
+ </select>
</mapper>
--
Gitblit v1.9.3