From d8786e0d08e9eaa8fdb4b7111049e523ace4d4c6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Mon, 29 Sep 2025 11:38:14 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-=20?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BC=80=E7=A5=A8=E5=AD=90=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=94=E5=9B=9E=E5=8F=91=E7=A5=A8=E5=B7=B2?=
 =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D=20=20=20=20TMS=E7=B3=BB=E7=BB=9F=20?=
 =?UTF-8?q?-=20=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95=E7=AE=A1=E7=90=86=20-?=
 =?UTF-8?q?=20=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=20-?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E8=B4=A6=E5=8D=95=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../mapper/EmisSettleInvoiceRelMapper.xml        | 16 ++++++++--------
 .../mapper/EmisSettlePayRecordMapper.xml         |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
index 6d918f6ea..6a9053d3a 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettleInvoiceRelMapper.xml
@@ -23,10 +23,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectEmisSettleInvoiceRelVo">
         select r.id, r.apply_seq_no, r.pay_id, r.bill_no, r.money, 
-               COALESCE(s.reced_money, 0) as reced_money,
+               COALESCE(i.reced_money, 0) as reced_money,
                r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site 
         from emis_settle_invoice_rel r
-        left join emis_settle_sub_bill s on r.bill_no = s.bill_no and s.del_flag = '0'
+        left join emis_settle_invoice_record i on r.apply_seq_no = i.apply_seq_no and i.del_flag = '0'
     </sql>
 
     <select id="selectEmisSettleInvoiceRelList" parameterType="EmisSettleInvoiceRel" resultMap="EmisSettleInvoiceRelWithSubBillResult">
@@ -72,28 +72,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEmisSettleInvoiceRelById" parameterType="Long" resultMap="EmisSettleInvoiceRelResult">
         select r.id, r.apply_seq_no, r.pay_id, r.bill_no, r.money, 
-               COALESCE(s.reced_money, 0) as reced_money,
+               COALESCE(i.reced_money, 0) as reced_money,
                r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site
         from emis_settle_invoice_rel r
-        left join emis_settle_sub_bill s on r.bill_no = s.bill_no and s.del_flag = '0'
+        left join emis_settle_invoice_record i on r.apply_seq_no = i.apply_seq_no and i.del_flag = '0'
         where r.id = #{id}
     </select>
 
     <select id="selectListByApplySeqNo" parameterType="String" resultMap="EmisSettleInvoiceRelWithSubBillResult">
         select r.id, r.apply_seq_no, r.pay_id, r.bill_no, r.money, 
-               COALESCE(s.reced_money, 0) as reced_money,
+               COALESCE(i.reced_money, 0) as reced_money,
                r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site 
         from emis_settle_invoice_rel r
-        left join emis_settle_sub_bill s on r.bill_no = s.bill_no and s.del_flag = '0'
+        left join emis_settle_invoice_record i on r.apply_seq_no = i.apply_seq_no and i.del_flag = '0'
         where r.apply_seq_no = #{applySeqNo} and r.del_flag='0'
     </select>
 
     <select id="selectHasOpenListBySettleBillNo" parameterType="String" resultMap="EmisSettleInvoiceRelWithSubBillResult">
         select r.id, r.apply_seq_no, r.pay_id, r.bill_no, r.money, 
-               COALESCE(s.reced_money, 0) as reced_money,
+               COALESCE(i.reced_money, 0) as reced_money,
                r.del_flag, r.create_by, r.create_time, r.update_by, r.update_time, r.create_site, r.update_site
         from emis_settle_invoice_rel r
-        left join emis_settle_sub_bill s on r.bill_no = s.bill_no and s.del_flag = '0'
+        left join emis_settle_invoice_record i on r.apply_seq_no = i.apply_seq_no and i.del_flag = '0'
         where  r.del_flag='0'
              AND r.apply_seq_no IN (
                     SELECT  x1.apply_seq_no FROM
diff --git a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
index 3645a4bb1..fd041a8a1 100644
--- a/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSettlePayRecordMapper.xml
@@ -640,7 +640,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getBillAmountsByPayIds" parameterType="java.util.List" resultType="map">
         select
             espbr.pay_id,
-            esb.rec_money
+            SUM(COALESCE(esb.rec_money, 0)) as rec_money
         from emis_settle_pay_bill_rel espbr
         left join emis_settle_bill esb on espbr.settle_bill_no = esb.settle_bill_no
         where espbr.del_flag = '0' and esb.del_flag = '0'