待转付列表调整还款方式为间还且(未垫款或中车类资方) 、转付状态为待转付、转付中的数据

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml

@@ -167,6 +167,9 @@
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid
         LEFT JOIN loan_transfer_payment_record AS r ON h.sid = r.repaymentHistorySid
+        LEFT JOIN loan_solutions as s ON p.salesOrderSid = s.salesOrderSid
+        LEFT JOIN loan_fin_policy as po ON s.policySid = po.sid
+        LEFT JOIN loan_fin_bank as b ON b.sid = po.bankSid
         <where>
             ${ew.sqlSegment}
         </where>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java

@@ -934,7 +934,8 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         if (StringUtils.isNotBlank(pagerQuery.getType())) {
             String type = pagerQuery.getType();
             if (type.equals("0")) {
-                qw.eq("h.paymentStateKey", "001").or().eq("h.paymentStateKey", "002");
+                //  qw.eq("h.paymentStateKey", "001").or().eq("h.paymentStateKey", "002");
+                qw.apply("(h.paymentStateKey = '001' OR h.paymentStateKey = '002')");
             } else if (type.equals("1")) {
                 qw.eq("h.paymentStateKey", "003");
             }
@@ -975,6 +976,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.apply(StringUtils.isNotEmpty(prepareStartDate), "date_format (h.prepareDate,'%Y-%m-%d') >= date_format('" + prepareStartDate + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(prepareEndDate), "date_format (h.prepareDate,'%Y-%m-%d') <= date_format('" + prepareEndDate + "','%Y-%m-%d')"
                 );
+        qw.apply("(b.reAdvances = '1' OR IFNULL(p.paymentMoney,0) <= 0)");
         IPage<TransferPaymentVo> pagging = baseMapper.transferPaymentList(page, qw);
         PagerVo<TransferPaymentVo> p = PagerUtil.pageToVo(pagging, null);
         return p;