From 880c2be4d27130b13386e7b817f7309e19458a89 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Mon, 24 Mar 2025 09:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B7=E5=90=8E=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentHistoryMapper.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml index f7bd75b2a3..8f21499082 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml @@ -391,15 +391,15 @@ LEFT JOIN anrui_fin.fin_collection_confirmation AS c ON s.collSid = c.sid LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid WHERE - s.receivablesName = '资金占用费' + (s.receivablesName = '资金占用费' OR s.receivablesName = '资方逾期利息' OR s.receivablesName = '资方退还垫款' OR s.receivablesName = '其他费用' OR s.receivablesName = '合同违约金' OR s.receivablesName = '名义价' OR s.receivablesName = '结清时资方逾期利息' - OR s.receivablesName = '贷款保证金扣罚' - AND s.auditState = 3 + OR s.receivablesName = '贷款保证金扣罚') + AND s.auditState = 3 and c.auditState = 3 ) AS a ${ew.sqlSegment} @@ -779,17 +779,17 @@ FROM anrui_fin.fin_selected_receivables_detailed AS s LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr AS j ON s.receivablesSid = j.sid - LEFT JOIN anrui_fin.fin_collection_confirmation AS c ON s.collSid = c.sid + LEFT JOIN anrui_fin.fin_collection_confirmation AS `c` ON s.collSid = `c`.sid LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid WHERE - s.receivablesName = '资金占用费' + (s.receivablesName = '资金占用费' OR s.receivablesName = '资方逾期利息' OR s.receivablesName = '资方退还垫款' OR s.receivablesName = '其他费用' OR s.receivablesName = '合同违约金' OR s.receivablesName = '名义价' - OR s.receivablesName = '结清时资方逾期利息' - AND s.auditState = 3 + OR s.receivablesName = '结清时资方逾期利息') + AND s.auditState = 3 and `c`.auditState = 3 ) AS a,( SELECT @row_number := 0