From 3d4b83be48730a8370015b8d84689b57e8cd63de Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Fri, 28 Jul 2023 19:28:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationMapper.xml | 9 +++++++-- .../FinSelectedReceivablesDetailedMapper.xml | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml index 4e8d6e0c56..6315ccd32c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationMapper.xml @@ -245,8 +245,13 @@ FROM fin_selected_receivables_detailed fsrd JOIN fin_collection_confirmation fcc ON fcc.`sid` = fsrd.`collSid` AND fcc.`pushMessgae` = 1 - LEFT JOIN `fin_funds_carried_forward_veh` ffc - ON ffc.`busSid` = fsrd.`sid` + LEFT JOIN (SELECT ffc.busSid, + ffc.thisUseMoney + FROM fin_funds_carried_forward_veh ffc + JOIN `fin_funds_carried_forward_apply` fa + ON ffc.mainSid = fa.sid + WHERE fa.`nodeState` != '终止') ffc + ON ffc.`busSid` = fsrd.`sid`` WHERE fsrd.sid = #{busSid} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index b243e65bea..ba669d768c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -603,7 +603,12 @@ ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) ) AS reveivableMoney FROM fin_selected_receivables_detailed ferd - LEFT JOIN `fin_funds_carried_forward_veh` ffc + LEFT JOIN (SELECT ffc.busSid, + ffc.thisUseMoney + FROM fin_funds_carried_forward_veh ffc + JOIN `fin_funds_carried_forward_apply` fa + ON ffc.mainSid = fa.sid + WHERE fa.`nodeState` != '终止') ffc ON ffc.`busSid` = ferd.`sid` WHERE ferd.sid = #{busSid}