From 143d771bffebfdd7d57f0fb9ec8b225817d0c1b6 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 24 Sep 2024 09:10:29 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisSettlePayRel.java   |  3 +++
 .../main/resources/mapper/EmisSettlePayRelMapper.xml   | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRel.java
index f1718d94f..9f36524f3 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRel.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettlePayRel.java
@@ -42,4 +42,7 @@ public class EmisSettlePayRel extends BaseEntity
     /* 金额 */
     private BigDecimal payMoney;
 
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
index 95b92038c..e4c16ac8a 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRelMapper.xml
@@ -11,11 +11,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="payMoney"    column="pay_money"    />
     </resultMap>
 
+    <resultMap id="EmisSettlePayRelWithSubBillResult" type="EmisSettlePayRel" extends="EmisSettlePayRelResult"  >
+        <association property="waybillDetail"
+                     column="bill_no"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+    </resultMap>
+
     <sql id="selectEmisSettlePayRelVo">
         select id, pay_id, bill_no, pay_money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_pay_rel
     </sql>
 
-    <select id="selectEmisSettlePayRelList" parameterType="EmisSettlePayRel" resultMap="EmisSettlePayRelResult">
+    <select id="selectEmisSettlePayRelList" parameterType="EmisSettlePayRel" resultMap="EmisSettlePayRelWithSubBillResult">
         <include refid="selectEmisSettlePayRelVo"/>
         <where>  
              del_flag='0'