修改贷后还款明细查询

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
         <where>
             ${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