Merge remote-tracking branch 'origin/master'

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java

@@ -59,4 +59,5 @@ public class RepaymentDetailsListVo implements Vo {
     private String buckle;
     @ApiModelProperty("款项类别")
     private String payCostTitleValue;
+    private String createTime;
 }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleApplyQuery.java

@@ -47,4 +47,6 @@ public class LoanSettleApplyQuery implements Query {
     @ApiModelProperty("结清日期")
     private String settingDateStart;
     private String settingDateEnd;
+
+    private String state;
 }

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

@@ -379,7 +379,8 @@
         h.skdBillNo AS billNo,
         '月还' AS payCostTitleValue,
         p.orgSidPath,
-        p.salesUserSid
+        p.salesUserSid,
+        h.createTime
         FROM
         loan_repayment_history AS h
         LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid UNION ALL
@@ -407,7 +408,8 @@
         c.billNo AS billNo,
         s.receivablesName AS payCostTitleValue,
         p.orgSidPath,
-        p.salesUserSid
+        p.salesUserSid,
+        s.createTime
         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

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

@@ -1532,7 +1532,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         qw.eq("1", "1");
         qw.orderBy(true, true, "a.useOrgName")
                 .orderBy(true, true, "a.vinNo")
-                .orderBy(true, true, "a.period")
+                .orderBy(true, false, "a.createTime")
                 .orderBy(true, true, "a.loanContractNo")
         ;
         IPage<RepaymentDetailsListVo> pagging = baseMapper.repaymentDetailsList(page, qw);

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -231,6 +231,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (StringUtils.isNotBlank(query.getLoanName())) {
                 qw.like("la.loanName", query.getLoanName());
             }
+            if (StringUtils.isNotBlank(query.getState())) {
+                qw.eq("la.`state`", query.getState());
+            }
             //资方
             if (StringUtils.isNotBlank(query.getBankName())) {
                 qw.like("la.bankName", query.getBankName());