From 6c17b0b6b0b97d02d16acf5c15914317b8758ecd Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Fri, 16 Aug 2024 10:19:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BF=98=E6=AC=BE=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentHistoryService.java            | 17 ++++++++++++++---
 .../LoanRepaymentScheduleService.java           |  1 +
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index 6232f9b1ba..7327786673 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -1805,7 +1805,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             qw.like("a.borrowerName", pagerQuery.getBorrowerName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDueOverdue())) {
-            qw.eq("a.dueOverdue", pagerQuery.getDueOverdue());
+            String query = "";
+            if (pagerQuery.getDueOverdue().equals("0")) {
+                query = "是";
+            } else if (pagerQuery.getDueOverdue().equals("1")) {
+                query = "否";
+            }
+            qw.eq("a.dueOverdue", query);
         }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
@@ -1862,8 +1868,13 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             }
         }
         if (StringUtils.isNotBlank(pagerQuery.getNowOverdue())) {
-            records = records.stream().filter(r -> r.getNowOverdue().equals(pagerQuery.getNowOverdue()))
-                    .collect(Collectors.toList());
+            if (pagerQuery.getNowOverdue().equals("0")) {
+                records = records.stream().filter(r -> r.getNowOverdue().equals("是"))
+                        .collect(Collectors.toList());
+            } else if (pagerQuery.getNowOverdue().equals("1")) {
+                records = records.stream().filter(r -> r.getNowOverdue().equals("否"))
+                        .collect(Collectors.toList());
+            }
         }
         return records;
     }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
index 18109ed6f4..98b559acc5 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
@@ -5484,6 +5484,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                 }
             } else if (sleep.equals("是")) {
                 LoanRepaymentSchedule schedule = new LoanRepaymentSchedule();
+                schedule.setOrgSidPath(orgPath);
                 schedule.setCreateBySid(userSid);
                 schedule.setIsOtherPolicy(isOther);
                 schedule.setSameBank(sameBank);