From aba1030de30f03317a489724120d924381042d02 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 15 Apr 2026 16:48:55 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20=20tms-=E8=BF=90=E5=8D=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E8=BF=90=E5=8D=95=E7=AD=BE=E6=94=B6?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0-=E5=B7=B2=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E7=9A=84=E8=BF=90=E5=8D=95=EF=BC=8C=E5=8D=95=E7=8B=AC?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=EF=BC=8C=E4=B8=8D=E4=BC=9A?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E7=AD=BE=E6=94=B6=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=B8=AD=E7=9A=84=E5=9B=BE=E7=89=87bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/EmisWaybillProblemInfoMapper.xml     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
index e2ede6558..976613c28 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml
@@ -36,11 +36,11 @@
         <result property="salesmen"    column="salesmen"    />
         <result property="payee"    column="payee"    />
         <result property="salesSupport"    column="sales_support"    />
+        <result property="problemTypeName"    column="problemTypeName"    />
+        <result property="registerSiteName"    column="registerSiteName"    />
+        <result property="registerManName"    column="registerManName"    />
 
-        <association property="problemTypeName"    column="problem_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectProblemTypeNameById"/>
         <association property="sendSiteName"    column="send_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerSiteName"    column="register_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
-        <association property="registerManName"    column="register_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
         <association property="reversionSiteName"    column="reversion_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
         <association property="reversionManName"    column="reversion_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
 
@@ -54,10 +54,19 @@
             a.reversion_str, a.reversion_man, a.reversion_man_code, a.reversion_site_code, a.reversion_date,
             a.bl_checkok, a.deal_result, a.bl_see, a.file_path, a.del_flag, a.create_by, a.create_time,
             a.update_by, a.update_time, a.remark, a.create_site, a.update_site,
-            b.send_date, b.salesmen, b.payee, c.sales_support
+            b.send_date, b.salesmen, b.payee, c.sales_support,
+            pt.type_name as problemTypeName,
+            pt.type_name as problem_type_name,
+            u.emp_name as registerManName,
+            u.emp_name as register_man_name,
+            rs.site_name as register_site_name,
+            rs.site_name as registerSiteName
         from emis_waybill_problem_info a
         left join emis_waybill b on a.bill_code = b.bill_code and b.del_flag = '0'
         left join emis_waybill_other c on b.bill_code = c.bill_code and c.del_flag = '0'
+        left join emis_problem_type pt on a.problem_type = pt.id and pt.del_flag = '0'
+        left join sys_user u on a.register_man_code = u.emp_code
+        left join emis_site rs on a.register_site_code = rs.site_code and rs.del_flag = '0'
     </sql>
 
     <select id="selectEmisWaybillProblemInfoList" parameterType="EmisWaybillProblemInfo" resultMap="EmisWaybillProblemInfoResult">