From 2134c18b515007887b317b38e1f798eba11b79eb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 1 Jul 2024 17:25:45 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisBaseMapper.xml    |  5 +++++
 .../mapper/EmisWaybillAjustApplyMapper.xml      | 17 ++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index 17ef2132e..199e90dd9 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -134,5 +134,10 @@
         select a.settle_name from emis_settle_type a where a.settle_type = #{settleType} limit 1
     </select>
 
+    <!--  查询运单调整类型 -->
+    <select id="selectAjustTypeNameByCode" parameterType="string" resultType="string">
+        select a.type_name from emis_waybill_ajust_type a where a.type_code = #{typeCode} limit 1
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
index b2af0e544..983033354 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAjustApplyMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisWaybillAjustApplyMapper">
 
-    <resultMap type="EmisWaybillAjustApply" id="BaseEmisWaybillAjustApplyResult">
+    <resultMap type="EmisWaybillAjustApply" id="BaseEmisWaybillAjustApplyResult"  extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="id"    column="id"    />
         <result property="billCode"    column="bill_code"    />
         <result property="applyType"    column="apply_type"    />
@@ -27,6 +27,21 @@
         <result property="centerConfirmManCode"    column="center_confirm_man_code"    />
         <result property="centerConfirmDate"    column="center_confirm_date"    />
         <result property="centerConfirmNote"    column="center_confirm_note"    />
+
+        <association property="applyTypeName"    column="apply_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectAjustTypeNameByCode"/>
+        <association property="applyManName"    column="apply_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="applySiteName"    column="apply_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="applyFinanceCenterName"    column="apply_finance_center_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+
+        <association property="destConfirmSiteName"    column="dest_confirm_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="destConfirmManName"    column="dest_confirm_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="destFinanceCenterName"    column="dest_finance_center_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+
+        <association property="centerConfirmSiteName"    column="center_confirm_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+        <association property="centerConfirmManName"    column="center_confirm_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+
+
+
     </resultMap>