From 5ab9b57c25b72f1381d427265976ca00491f3c69 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 2 Sep 2024 07:34:41 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisSettleInvoiceRel.java      |  3 +++
 .../mapper/EmisSettleInvoiceRelMapper.xml          | 14 +++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRel.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRel.java
index 776c3e59d..9c3318d26 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRel.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleInvoiceRel.java
@@ -44,4 +44,7 @@ public class EmisSettleInvoiceRel extends BaseEntity
     /* 申请开票金额 */
     private BigDecimal money;
 
+    //   扩展参数
+    private EmisWaybill waybillDetail;
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
index 35538ea63..54d5284c0 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
@@ -12,16 +12,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="money"    column="money"    />
     </resultMap>
 
+    <resultMap id="EmisSettleInvoiceRelWithSubBillResult" type="EmisSettleInvoiceRel" extends="EmisSettleInvoiceRelResult"  >
+        <association property="waybillDetail"
+                     column="bill_no"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+    </resultMap>
+
     <sql id="selectEmisSettleInvoiceRelVo">
         select id, apply_seq_no, pay_id, bill_no, money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_invoice_rel
     </sql>
 
-    <select id="selectEmisSettleInvoiceRelList" parameterType="EmisSettleInvoiceRel" resultMap="EmisSettleInvoiceRelResult">
+    <select id="selectEmisSettleInvoiceRelList" parameterType="EmisSettleInvoiceRel" resultMap="EmisSettleInvoiceRelWithSubBillResult">
         <include refid="selectEmisSettleInvoiceRelVo"/>
         <where>  
              del_flag='0'
             <if test="id != null "> and id = #{id}</if>
-            <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no like concat('%', #{applySeqNo}, '%')</if>
+            <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no=#{applySeqNo}</if>
             <if test="payId != null  and payId != ''"> and pay_id like concat('%', #{payId}, '%')</if>
             <if test="billNo != null  and billNo != ''"> and bill_no like concat('%', #{billNo}, '%')</if>
             <if test="money != null "> and money = #{money}</if>
@@ -61,7 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where a.id = #{id}
     </select>
 
-    <select id="selectListByApplySeqNo" parameterType="String" resultMap="EmisSettleInvoiceRelResult">
+    <select id="selectListByApplySeqNo" parameterType="String" resultMap="EmisSettleInvoiceRelWithSubBillResult">
         select id, apply_seq_no, pay_id, bill_no, money, del_flag, create_by, create_time, update_by, update_time, create_site, update_site 
         from emis_settle_invoice_rel a
         where a.apply_seq_no = #{applySeqNo} and del_flag='0'