From 98f41645e12b157f4b1337d814d30e6dc471b2fd Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 19 Aug 2024 15:19:44 +0800
Subject: [PATCH] md

---
 .../mapper/EmisSettleSubBillMapper.xml        | 64 ++++++++++---------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
index 3f325c00d..fe5cf63fd 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
@@ -45,37 +45,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--列表模式-->
     <resultMap id="EmisSettleSubBillListResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult"  >
 
-        <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"/>
-        <result property="waybillDetail.productTypeName" column="product_type_name"/>
-        <result property="waybillDetail.problemTypeName" column="problem_type_name"/>
+        <association property="waybillDetail"
+                     column="bill_code"
+                     select="com.xdadan.erp.emis.mapper.EmisWaybillMapper.selectWaybillBaseInfoByBillCode"
+                     fetchType="lazy"
+        />
 
-        <result property="waybillDetail.blSpecialQuote" column="bl_special_quote"/>
-        <result property="waybillDetail.calcFeeType" column="calc_fee_type"/>
-        <result property="waybillDetail.sendDate" column="send_date"/>
-        <result property="waybillDetail.sendCompany" column="send_company"/>
-        <result property="waybillDetail.custName" column="cust_no"/>
-        <result property="waybillDetail.custName" column="cust_name"/>
-        <result property="waybillDetail.paymentType" column="payment_type"/>
+<!--        <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"/>-->
+<!--        <result property="waybillDetail.productTypeName" column="product_type_name"/>-->
+<!--        <result property="waybillDetail.problemTypeName" column="problem_type_name"/>-->
 
-        <result property="waybillDetail.timeType" column="time_type"/>
-        <result property="waybillDetail.sendName" column="send_name"/>
-        <result property="waybillDetail.parcelQty" column="parcel_qty"/>
-        <result property="waybillDetail.billWeight" column="bill_weight"/>
-        <result property="waybillDetail.totalVolume" column="total_volume"/>
-        <result property="waybillDetail.volumeWeight" column="volume_weight"/>
-        <result property="waybillDetail.settlementWeight" column="settlement_weight"/>
-        <result property="waybillDetail.freight" column="freight"/>
-        <result property="waybillDetail.realFee" column="real_fee"/>
-        <result property="waybillDetail.feeRemark" column="fee_remark"/>
-        <result property="waybillDetail.paymentType" column="payment_type"/>
-        <result property="waybillDetail.remark" column="remark"/>
-        <result property="waybillDetail.payee" column="payee"/>
-        <result property="waybillDetail.salesmen" column="salesmen"/>
-        <result property="waybillDetail.blIsQuestion" column="bl_is_question"/>
-        <result property="waybillDetail.problemCause" column="problem_cause"/>
+<!--        <result property="waybillDetail.blSpecialQuote" column="bl_special_quote"/>-->
+<!--        <result property="waybillDetail.calcFeeType" column="calc_fee_type"/>-->
+<!--        <result property="waybillDetail.sendDate" column="send_date"/>-->
+<!--        <result property="waybillDetail.sendCompany" column="send_company"/>-->
+<!--        <result property="waybillDetail.custName" column="cust_no"/>-->
+<!--        <result property="waybillDetail.custName" column="cust_name"/>-->
+<!--        <result property="waybillDetail.paymentType" column="payment_type"/>-->
+
+<!--        <result property="waybillDetail.timeType" column="time_type"/>-->
+<!--        <result property="waybillDetail.sendName" column="send_name"/>-->
+<!--        <result property="waybillDetail.parcelQty" column="parcel_qty"/>-->
+<!--        <result property="waybillDetail.billWeight" column="bill_weight"/>-->
+<!--        <result property="waybillDetail.totalVolume" column="total_volume"/>-->
+<!--        <result property="waybillDetail.volumeWeight" column="volume_weight"/>-->
+<!--        <result property="waybillDetail.settlementWeight" column="settlement_weight"/>-->
+<!--        <result property="waybillDetail.freight" column="freight"/>-->
+<!--        <result property="waybillDetail.realFee" column="real_fee"/>-->
+<!--        <result property="waybillDetail.feeRemark" column="fee_remark"/>-->
+<!--        <result property="waybillDetail.paymentType" column="payment_type"/>-->
+<!--        <result property="waybillDetail.remark" column="remark"/>-->
+<!--        <result property="waybillDetail.payee" column="payee"/>-->
+<!--        <result property="waybillDetail.salesmen" column="salesmen"/>-->
+<!--        <result property="waybillDetail.blIsQuestion" column="bl_is_question"/>-->
+<!--        <result property="waybillDetail.problemCause" column="problem_cause"/>-->
 
 
         <association property="feeitemList"