From 9aa83ac43c3a2a8dbba5bd38496f5ca9ac7a94d5 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Fri, 5 Sep 2025 13:30:44 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20TMS=E7=B3=BB=E7=BB=9F=20-=20=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1=E5=BC=80=E7=A5=A8=E5=A4=84=E7=90=86=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=20?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=8F=91=E7=A5=A8=E5=8F=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../mapper/EmisSettleInvoiceRecordMapper.xml  | 104 +++++++++---------
 1 file changed, 53 insertions(+), 51 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
index 186801e9c..54b271ed0 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRecordMapper.xml
@@ -71,58 +71,60 @@
 
     <select id="selectEmisSettleInvoiceRecordList" parameterType="EmisSettleInvoiceRecord" resultMap="EmisSettleInvoiceRecordResult">
 
-        select id, apply_seq_no, apply_date, apply_man_code, apply_site_code, customer_code, customer_name, settle_bill_no, settle_bill_name, apply_money, invoice_type, openbill_scope, company_name, company_tax_no, company_tel, company_address, invioce_remark, bank_name, bank_acc_no, contact, phone, real_tax_type, orig_open_money, add_tax_rate, add_open_money, open_money_max, open_money, invoice_no, reced_money, payment_status, invoice_status, invoice_status_desc, recieve_address, email, file_path, remark, bl_audit, audit_date, audit_man_code, audit_site_code, audit_note, op_man_code, op_date, op_site_code, open_ch_id, open_ch_status, open_ch_status_desc, open_com_code, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        select a.id, a.apply_seq_no, a.apply_date, a.apply_man_code, a.apply_site_code, a.customer_code, a.customer_name, a.settle_bill_no, a.settle_bill_name, a.apply_money, a.invoice_type, a.openbill_scope, a.company_name, a.company_tax_no, a.company_tel, a.company_address, a.invioce_remark, a.bank_name, a.bank_acc_no, a.contact, a.phone, a.real_tax_type, a.orig_open_money, a.add_tax_rate, a.add_open_money, a.open_money_max, a.open_money, ch.invoice_no, a.reced_money, a.payment_status, a.invoice_status, a.invoice_status_desc, a.recieve_address, a.email, a.file_path, a.remark, a.bl_audit, a.audit_date, a.audit_man_code, a.audit_site_code, a.audit_note, a.op_man_code, a.op_date, a.op_site_code, a.open_ch_id, a.open_ch_status, a.open_ch_status_desc, a.open_com_code, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.create_site, a.update_site
         from emis_settle_invoice_record a
+        left join emis_settle_invoice_ch_record ch on a.apply_seq_no = ch.apply_seq_no and ch.del_flag = '0'
+
 
         <where>
-            del_flag='0'
-            <if test="id != null "> and id = #{id}</if>
-            <if test="applySeqNo != null  and applySeqNo != ''"> and apply_seq_no = #{applySeqNo}</if>
-            <if test="applyDate != null "> and apply_date = #{applyDate}</if>
-            <if test="applyManCode != null  and applyManCode != ''"> and apply_man_code = #{applyManCode}</if>
-            <if test="applySiteCode != null  and applySiteCode != ''"> and apply_site_code = #{applySiteCode}</if>
-            <if test="customerCode != null  and customerCode != ''"> and customer_code = #{customerCode}</if>
-            <if test="customerName != null  and customerName != ''"> and customer_name like concat('%', #{customerName}, '%')</if>
-            <if test="settleBillName != null  and settleBillName != ''"> and settle_bill_name like concat('%', #{settleBillName}, '%')</if>
-            <if test="applyMoney != null "> and apply_money = #{applyMoney}</if>
-            <if test="paymentStatus != null  and paymentStatus != ''"> and payment_status=#{paymentStatus}</if>
-            <if test="invoiceType != null  and invoiceType != ''"> and invoice_type = #{invoiceType}</if>
-            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
-            <if test="companyTaxNo != null  and companyTaxNo != ''"> and company_tax_no = #{companyTaxNo}</if>
-            <if test="companyTel != null  and companyTel != ''"> and company_tel like concat('%', #{companyTel}, '%')</if>
-            <if test="companyAddress != null  and companyAddress != ''"> and company_address like concat('%', #{companyAddress}, '%')</if>
-            <if test="bankName != null  and bankName != ''"> and bank_name like concat('%', #{bankName}, '%')</if>
-            <if test="bankAccNo != null  and bankAccNo != ''"> and bank_acc_no like concat('%', #{bankAccNo}, '%')</if>
-            <if test="contact != null  and contact != ''"> and contact like concat('%', #{contact}, '%')</if>
-            <if test="phone != null  and phone != ''"> and phone like concat('%', #{phone}, '%')</if>
-            <if test="realTaxType != null  and realTaxType != ''"> and real_tax_type = #{realTaxType}</if>
-            <if test="openMoneyMax != null "> and open_money_max = #{openMoneyMax}</if>
-            <if test="openMoney != null "> and open_money = #{openMoney}</if>
-            <if test="invoiceNo != null  and invoiceNo != ''"> and invoice_no = #{invoiceNo}</if>
-            <if test="invoiceStatus != null  and invoiceStatus != ''"> and invoice_status = #{invoiceStatus}</if>
-            <if test="invoiceStatusDesc != null  and invoiceStatusDesc != ''"> and invoice_status_desc like concat('%', #{invoiceStatusDesc}, '%')</if>
-            <if test="recieveAddress != null  and recieveAddress != ''"> and recieve_address like concat('%', #{recieveAddress}, '%')</if>
-            <if test="email != null  and email != ''"> and email like concat('%', #{email}, '%')</if>
-            <if test="filePath != null  and filePath != ''"> and file_path like concat('%', #{filePath}, '%')</if>
-            <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
-            <if test="blAudit != null  and blAudit != ''"> and bl_audit = #{blAudit}</if>
-            <if test="auditDate != null "> and audit_date = #{auditDate}</if>
-            <if test="auditManCode != null  and auditManCode != ''"> and audit_man_code like concat('%', #{auditManCode}, '%')</if>
-            <if test="auditSiteCode != null  and auditSiteCode != ''"> and audit_site_code like concat('%', #{auditSiteCode}, '%')</if>
-            <if test="opManCode != null  and opManCode != ''"> and op_man_code like concat('%', #{opManCode}, '%')</if>
-            <if test="opDate != null "> and op_date = #{opDate}</if>
-            <if test="opSiteCode != null  and opSiteCode != ''"> and op_site_code = #{opSiteCode}</if>
-            <if test="openChId != null  and openChId != ''"> and open_ch_id = #{openChId}</if>
-            <if test="openChStatus != null  and openChStatus != ''"> and open_ch_status = #{openChStatus}</if>
-            <if test="openChStatusDesc != null  and openChStatusDesc != ''"> and open_ch_status_desc = #{openChStatusDesc}</if>
-            <if test="openComCode != null  and openComCode != ''"> and open_com_code = #{openComCode}</if>
-            <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
-            <if test="createBy != null  and createBy != ''"> and create_by like concat('%', #{createBy}, '%')</if>
-            <if test="createTime != null "> and create_time = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
-            <if test="updateTime != null "> and update_time = #{updateTime}</if>
-            <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
-            <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+            a.del_flag='0'
+            <if test="id != null "> and a.id = #{id}</if>
+            <if test="applySeqNo != null  and applySeqNo != ''"> and a.apply_seq_no = #{applySeqNo}</if>
+            <if test="applyDate != null "> and a.apply_date = #{applyDate}</if>
+            <if test="applyManCode != null  and applyManCode != ''"> and a.apply_man_code = #{applyManCode}</if>
+            <if test="applySiteCode != null  and applySiteCode != ''"> and a.apply_site_code = #{applySiteCode}</if>
+            <if test="customerCode != null  and customerCode != ''"> and a.customer_code = #{customerCode}</if>
+            <if test="customerName != null  and customerName != ''"> and a.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="settleBillName != null  and settleBillName != ''"> and a.settle_bill_name like concat('%', #{settleBillName}, '%')</if>
+            <if test="applyMoney != null "> and a.apply_money = #{applyMoney}</if>
+            <if test="paymentStatus != null  and paymentStatus != ''"> and a.payment_status=#{paymentStatus}</if>
+            <if test="invoiceType != null  and invoiceType != ''"> and a.invoice_type = #{invoiceType}</if>
+            <if test="companyName != null  and companyName != ''"> and a.company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyTaxNo != null  and companyTaxNo != ''"> and a.company_tax_no = #{companyTaxNo}</if>
+            <if test="companyTel != null  and companyTel != ''"> and a.company_tel like concat('%', #{companyTel}, '%')</if>
+            <if test="companyAddress != null  and companyAddress != ''"> and a.company_address like concat('%', #{companyAddress}, '%')</if>
+            <if test="bankName != null  and bankName != ''"> and a.bank_name like concat('%', #{bankName}, '%')</if>
+            <if test="bankAccNo != null  and bankAccNo != ''"> and a.bank_acc_no like concat('%', #{bankAccNo}, '%')</if>
+            <if test="contact != null  and contact != ''"> and a.contact like concat('%', #{contact}, '%')</if>
+            <if test="phone != null  and phone != ''"> and a.phone like concat('%', #{phone}, '%')</if>
+            <if test="realTaxType != null  and realTaxType != ''"> and a.real_tax_type = #{realTaxType}</if>
+            <if test="openMoneyMax != null "> and a.open_money_max = #{openMoneyMax}</if>
+            <if test="openMoney != null "> and a.open_money = #{openMoney}</if>
+            <if test="invoiceNo != null  and invoiceNo != ''"> and ch.invoice_no = #{invoiceNo}</if>
+            <if test="invoiceStatus != null  and invoiceStatus != ''"> and a.invoice_status = #{invoiceStatus}</if>
+            <if test="invoiceStatusDesc != null  and invoiceStatusDesc != ''"> and a.invoice_status_desc like concat('%', #{invoiceStatusDesc}, '%')</if>
+            <if test="recieveAddress != null  and recieveAddress != ''"> and a.recieve_address like concat('%', #{recieveAddress}, '%')</if>
+            <if test="email != null  and email != ''"> and a.email like concat('%', #{email}, '%')</if>
+            <if test="filePath != null  and filePath != ''"> and a.file_path like concat('%', #{filePath}, '%')</if>
+            <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
+            <if test="blAudit != null  and blAudit != ''"> and a.bl_audit = #{blAudit}</if>
+            <if test="auditDate != null "> and a.audit_date = #{auditDate}</if>
+            <if test="auditManCode != null  and auditManCode != ''"> and a.audit_man_code like concat('%', #{auditManCode}, '%')</if>
+            <if test="auditSiteCode != null  and auditSiteCode != ''"> and a.audit_site_code like concat('%', #{auditSiteCode}, '%')</if>
+            <if test="opManCode != null  and opManCode != ''"> and a.op_man_code like concat('%', #{opManCode}, '%')</if>
+            <if test="opDate != null "> and a.op_date = #{opDate}</if>
+            <if test="opSiteCode != null  and opSiteCode != ''"> and a.op_site_code = #{opSiteCode}</if>
+            <if test="openChId != null  and openChId != ''"> and a.open_ch_id = #{openChId}</if>
+            <if test="openChStatus != null  and openChStatus != ''"> and a.open_ch_status = #{openChStatus}</if>
+            <if test="openChStatusDesc != null  and openChStatusDesc != ''"> and a.open_ch_status_desc = #{openChStatusDesc}</if>
+            <if test="openComCode != null  and openComCode != ''"> and a.open_com_code = #{openComCode}</if>
+            <if test="delFlag != null  and delFlag != ''"> and a.del_flag like concat('%', #{delFlag}, '%')</if>
+            <if test="createBy != null  and createBy != ''"> and a.create_by like concat('%', #{createBy}, '%')</if>
+            <if test="createTime != null "> and a.create_time = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''"> and a.update_by like concat('%', #{updateBy}, '%')</if>
+            <if test="updateTime != null "> and a.update_time = #{updateTime}</if>
+            <if test="createSite != null  and createSite != ''"> and a.create_site like concat('%', #{createSite}, '%')</if>
+            <if test="updateSite != null  and updateSite != ''"> and a.update_site like concat('%', #{updateSite}, '%')</if>
 
 
             <if test="settleBillNo != null  and settleBillNo != ''">
@@ -214,7 +216,7 @@
             </if>
 
         </where>
-        order by create_time desc
+        order by a.create_time desc
     </select>
 
     <select id="selectInvoiceRecordListBySettleBillNo" parameterType="String" resultMap="EmisSettleInvoiceRecordResult">
@@ -519,4 +521,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>