From f088078e626e16b28d69cdbcbf514b30f1dcefe7 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 22 四月 2026 11:51:58 +0800
Subject: [PATCH] refactor(production): 优化生产订单及工单号生成逻辑
---
src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
index 08e16e4..2e69ab0 100644
--- a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
+++ b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
@@ -29,14 +29,21 @@
coalesce(c.tenant_id, cp.tenant_id) as tenant_id,
coalesce(c.basic_bank_account, cp.basic_bank_account) as basic_bank_account,
coalesce(c.bank_account, cp.bank_account) as bank_account,
- coalesce(c.bank_code, cp.bank_code) as bank_code
+ coalesce(c.bank_code, cp.bank_code) as bank_code,
+ coalesce(c.corporation, cp.corporation) as corporation,
+ coalesce(c.fax, cp.fax) as fax,
+ coalesce(c.agent, cp.agent) as agent,
+ coalesce(c.bank_name, cp.bank_name) as bank_name
from customer_private_pool cpp
left join customer c on c.id = cpp.customer_id and cpp.type = 1
left join customer_private cp on cp.id = cpp.customer_id and cpp.type = 0
<where>
cpp.delete_flag = 0
<if test="c.customerName != null and c.customerName != ''">
- and c.customer_name like concat('%', #{c.customerName}, '%')
+ and (c.customer_name like concat('%', #{c.customerName}, '%') or cp.customer_name like concat('%', #{c.customerName}, '%'))
+ </if>
+ <if test="c.customerType != null">
+ and c.customer_type = #{c.customerType}
</if>
<if test="c.boundId != null">
and cpp.bound_id = #{c.boundId}
@@ -61,7 +68,11 @@
coalesce(c.tenant_id, cp.tenant_id) as tenant_id,
coalesce(c.basic_bank_account, cp.basic_bank_account) as basic_bank_account,
coalesce(c.bank_account, cp.bank_account) as bank_account,
- coalesce(c.bank_code, cp.bank_code) as bank_code
+ coalesce(c.bank_code, cp.bank_code) as bank_code,
+ coalesce(c.corporation, cp.corporation) as corporation,
+ coalesce(c.fax, cp.fax) as fax,
+ coalesce(c.agent, cp.agent) as agent,
+ coalesce(c.bank_name, cp.bank_name) as bank_name
from customer_private_pool cpp
left join customer c on c.id = cpp.customer_id and cpp.type = 1
left join customer_private cp on cp.id = cpp.customer_id and cpp.type = 0
@@ -89,9 +100,13 @@
coalesce(c.basic_bank_account, cp.basic_bank_account) as basic_bank_account,
coalesce(c.bank_account, cp.bank_account) as bank_account,
coalesce(c.bank_code, cp.bank_code) as bank_code
+ coalesce(c.corporation, cp.corporation) as corporation,
+ coalesce(c.fax, cp.fax) as fax,
+ coalesce(c.agent, cp.agent) as agent,
+ coalesce(c.bank_name, cp.bank_name) as bank_name
from customer_private_pool cpp
- left join customer c on c.id = cpp.customer_id and cpp.type = 1
- left join customer_private cp on cp.id = cpp.customer_id and cpp.type = 0
+ left join customer c on c.id = cpp.customer_id and cpp.type = 1
+ left join customer_private cp on cp.id = cpp.customer_id and cpp.type = 0
</select>
</mapper>
--
Gitblit v1.9.3