From 42d6cd077f2d23fa70bc14dacddf8b32e231a2bf Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 23 May 2025 16:54:51 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E8=88=AA=E7=BA=BF=E5=BC=80?=
 =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=E8=87=AA=E6=B5=8Bbug=20committer:?=
 =?UTF-8?q?=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 emis-biz/src/main/resources/mapper/EmisBaseMapper.xml  |  5 +++++
 .../mapper/EmisSettleInvoiceChRecordMapper.xml         | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index be3e0279c..612790ac3 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -34,6 +34,11 @@
         <result property="updateTime"    column="update_time"    />
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
+
+        <result property="createByName" column="create_by_name" />
+        <result property="updateByName" column="update_by_name" />
+        <result property="createSiteName" column="create_site_name" />
+        <result property="updateSiteName" column="update_site_name" />
     </resultMap>
 
     <!--    查询区域名称  -->
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
index e4611cf43..8722f2a56 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceChRecordMapper.xml
@@ -122,7 +122,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         smi.send_month,
         bri.settle_type,
         bri.open_bill_remark,
-        pdi.pay_days
+        pdi.pay_days,
+        cu.emp_name as create_by_name,
+        uu.emp_name as update_by_name,
+        cs.site_name as create_site_name,
+        us.site_name as update_site_name
         FROM emis_settle_invoice_ch_record a
         LEFT JOIN (
         SELECT
@@ -213,6 +217,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE bd.del_flag = '0'
         GROUP BY bd.id, b.settle_type
         ) bri ON bri.id = a.id
+        LEFT JOIN sys_user cu ON cu.user_id = a.create_by AND cu.del_flag = '0'
+        LEFT JOIN sys_user uu ON uu.user_id = a.update_by AND uu.del_flag = '0'
+        LEFT JOIN emis_site cs ON cs.site_code = a.create_site AND cs.del_flag = '0'
+        LEFT JOIN emis_site us ON us.site_code = a.update_site AND us.del_flag = '0'
         WHERE a.del_flag = '0'
         <if test="id != null">AND a.id = #{id}</if>
         <if test="reqNo != null and reqNo != ''">AND a.req_no = #{reqNo}</if>