From e7f7fb46a0e7b0947f4e30385a5a37d7d1f68469 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 10 Mar 2025 12:50:52 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisCreditCustomer.java   |  6 ++
 .../mapper/EmisCreditCustomerMapper.xml       | 55 +++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java
index 0f77ce21e..33b01785e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCreditCustomer.java
@@ -56,4 +56,10 @@ public class EmisCreditCustomer extends BaseEntity
     /* 是否启用 1-启用 0-未启用 */
     private String blOpen;
 
+
+
+    // 其它扩展字段
+    /* 客户名称 */
+    private String customerName;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
index 5eeb82eab..def2beba0 100644
--- a/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCreditCustomerMapper.xml
@@ -15,35 +15,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="startDate"    column="start_date"    />
         <result property="endDate"    column="end_date"    />
         <result property="blOpen"    column="bl_open"    />
+
+        <result property="customerName"    column="customer_name"    />
     </resultMap>
 
     <sql id="selectEmisCreditCustomerVo">
-        select id, customer_code, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_credit_customer
+        select id, customer_code, cur_money, cur_money_rate, credit_money, currency, trans_type, start_date, end_date, bl_open, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_credit_customer
     </sql>
 
     <select id="selectEmisCreditCustomerList" parameterType="EmisCreditCustomer" resultMap="EmisCreditCustomerResult">
-        <include refid="selectEmisCreditCustomerVo"/>
-        <where>  
-             del_flag='0'
-            <if test="id != null "> and id = #{id}</if>
-            <if test="customerCode != null  and customerCode != ''"> and customer_code like concat('%', #{customerCode}, '%')</if>
-            <if test="curMoney != null "> and cur_money = #{curMoney}</if>
-            <if test="curMoneyRate != null "> and cur_money_rate = #{curMoneyRate}</if>
-            <if test="creditMoney != null "> and credit_money = #{creditMoney}</if>
-            <if test="currency != null  and currency != ''"> and currency like concat('%', #{currency}, '%')</if>
-            <if test="transType != null  and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
-            <if test="startDate != null "> and start_date = #{startDate}</if>
-            <if test="endDate != null "> and end_date = #{endDate}</if>
-            <if test="blOpen != null  and blOpen != ''"> and bl_open like concat('%', #{blOpen}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
-            <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
-            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+        select
+            a.id, a.customer_code, a.cur_money, a.cur_money_rate,
+            a.credit_money, a.currency, a.trans_type, a.start_date, a.end_date,
+            a.bl_open, a.remark, a.tenant_id, a.del_flag, a.create_by, a.create_time,
+            a.update_by, a.update_time, a.create_site, a.update_site,
+            b.customer_name
+        from emis_credit_customer a,emis_customer_user b
+        <where>
+             a.del_flag='0' and b.del_flag='0' and a.customer_code=b.customer_code
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="customerCode != null  and customerCode != ''"> and a.customer_code=#{customerCode}</if>
+            <if test="curMoney != null "> and a.cur_money = #{curMoney}</if>
+            <if test="curMoneyRate != null "> and a.cur_money_rate = #{curMoneyRate}</if>
+            <if test="creditMoney != null "> and a.credit_money = #{creditMoney}</if>
+            <if test="currency != null  and currency != ''"> and a.currency like concat('%', #{currency}, '%')</if>
+            <if test="transType != null  and transType != ''"> and a.trans_type like concat('%', #{transType}, '%')</if>
+            <if test="startDate != null "> and a.start_date = #{startDate}</if>
+            <if test="endDate != null "> and a.end_date = #{endDate}</if>
+            <if test="blOpen != null  and blOpen != ''"> and a.bl_open like concat('%', #{blOpen}, '%')</if>
+            <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
+            <if test="tenantId != null  and tenantId != ''"> and a.tenant_id like concat('%', #{tenantId}, '%')</if>
+            <if test="delFlag != null  and delFlag != ''"> and a.del_flag like concat('%', #{delFlag}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and a.create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and a.update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and a.update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and a.create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and a.update_site like concat('%', #{updateSite}, '%')</if>
         </where>
         order by create_time desc
     </select>