From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml b/src/main/resources/mapper/basic/CustomerPrivatePoolMapper.xml
index 08e16e4..99bfd98 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
@@ -88,10 +99,47 @@
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
+ 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>
+ <select id="selectByCusterNames" resultType="com.ruoyi.basic.dto.CustomerPrivatePoolDto">
+ select cpp.id,
+ cpp.bound_id,
+ cpp.type,
+ coalesce(c.id, cp.id) as customer_id,
+ coalesce(c.customer_name, cp.customer_name) as customer_name,
+ coalesce(c.customer_type, cp.customer_type) as customer_type,
+ coalesce(c.taxpayer_identification_number, cp.taxpayer_identification_number) as taxpayer_identification_number,
+ coalesce(c.company_address, cp.company_address) as company_address,
+ coalesce(c.company_phone, cp.company_phone) as company_phone,
+ coalesce(c.contact_person, cp.contact_person) as contact_person,
+ coalesce(c.contact_phone, cp.contact_phone) as contact_phone,
+ coalesce(c.maintainer, cp.maintainer) as maintainer,
+ coalesce(c.maintenance_time, cp.maintenance_time) as maintenance_time,
+ 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.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 c.customer_name in
+ <foreach item="item" collection="collect" separator="," open="(" close=")">
+ #{item}
+ </foreach> or cp.customer_name in
+ <foreach item="item" collection="collect" separator="," open="(" close=")">
+ #{item}
+ </foreach>
</select>
</mapper>
--
Gitblit v1.9.3