From 55a7ffbfdc4421066e1bfc0c730c107b7f90fcf1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 13 Aug 2024 10:37:41 +0800
Subject: [PATCH] md

---
 .../mapper/EmisSettleSubBillMapper.xml        | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index fcfb39cf3..c712e69ae 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -42,16 +42,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     </resultMap>
+    <!--列表模式-->
+    <resultMap id="EmisSettleSubBillListResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult"  >
 
-    <resultMap id="EmisSettleSubBillResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult"  >
-<!--        <association property="waybillDetail"-->
-<!--                     column="bill_code"-->
-<!--                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"-->
-<!--                     fetchType="lazy"-->
-<!--        />-->
-
-
-
+        <result property="waybillDetail.billCode" column="bill_code"/>
         <result property="waybillDetail.sendSiteName" column="send_site_name"/>
         <result property="waybillDetail.dispatchUnderlingSiteName" column="dispatch_underling_site_name"/>
         <result property="waybillDetail.transLineTypeName" column="trans_line_type_name"/>
@@ -96,12 +90,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
 
+    <resultMap id="EmisSettleSubBillResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult"  >
+        <association property="waybillDetail"
+                     column="bill_code"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
+
+        <association property="feeitemList"
+                     column="bill_no"
+                     select="com.xdadan.erp.emis.mapper.EmisSettleSubBillFeeitemMapper.selectFeeitemListBySubBillNo"
+                     fetchType="lazy"
+        />
+
+        <association property="confirmCenterManName"    column="confirm_center_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="confirmSiteManName"    column="confirm_site_man_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectEmpNameByCode"/>
+        <association property="confirmSiteName"    column="confirm_site_code" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectSiteNameByCode"/>
+
+    </resultMap>
+
+
 
     <sql id="selectEmisSettleSubBillVo">
         select id, bill_no, parent_bill_no, settle_bill_no, bill_code, bill_date, bill_fee, currency, settle_type, bl_split, bl_merge, bill_month, cust_no, cust_name, customer_code, customer_name, payee, salesmen, bl_special_quote, bl_sensitive, bl_confirm_center, confirm_center_date, confirm_center_note, confirm_center_man_code, confirm_center_code, bl_confirm_site, confirm_site_date, confirm_site_man_code, confirm_site_note, confirm_site_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_settle_sub_bill
     </sql>
 
-    <select id="selectEmisSettleSubBillList" parameterType="EmisSettleSubBill" resultMap="EmisSettleSubBillResult">
+    <select id="selectEmisSettleSubBillList" parameterType="EmisSettleSubBill" resultMap="EmisSettleSubBillListResult">
         select b.id, b.bill_no, b.parent_bill_no, b.settle_bill_no, b.bill_code, b.bill_date,
         b.bill_fee, b.currency, b.settle_type, b.bl_split, b.bl_merge, b.bill_month, b.cust_no,b.cust_name,
         b.customer_code, b.customer_name, b.payee, b.salesmen, b.bl_special_quote, b.bl_sensitive,