From 784054d98d6338e194a7ec85d6d115f72acb3d91 Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 8 Apr 2025 15:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=88=E8=BF=98=E8=AE=A1?=
 =?UTF-8?q?=E6=8F=90=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanMonthlyAccrualApplyMapper.xml         | 22 ++++---------------
 .../LoanMonthlyAccrualApplyService.java       |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
index 89f48c3be7..a973d564be 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
@@ -54,7 +54,7 @@
     </select>
     <select id="selRepaymentDetailsByDueDate"
             resultType="com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyPlanRecord">
-        SELECT
+        SELECT DISTINCT
         *
         FROM
         (
@@ -71,24 +71,10 @@
         date_format ( p.dueDate, '%Y-%m-%d' ) dueDate,
         p.dueMoney,
         p.dept salesDept,
-        IFNULL(
-        (
-        p.dueMoney - IFNULL((
-        SELECT
-        SUM(
-        IFNULL( h.actualMoney, 0 ))
-        FROM
-        loan_repayment_history AS h
-        WHERE
-        h.planDetailSid = p.sid
-        AND h.updateState = '1'
-        ),
-        0
-        )),
-        0
-        ) AS money
+        v.settleState
         FROM
-        loan_repayment_plan_details p
+        loan_repayment_plan_details as p
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON p.busVinSid = v.sid
         ) a
         <where>
             ${ew.sqlSegment}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
index 820e4e3914..ddbc27ba58 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
@@ -169,7 +169,7 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
         queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
                 apply(StringUtils.isNotEmpty(last), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
                 );
-        queryWrapper.apply("a.money > 0");
+        queryWrapper.apply("a.settleState != 1");
         records = baseMapper.selRepaymentDetailsByDueDate(queryWrapper);
         records.removeAll(Collections.singleton(null));
         if (!records.isEmpty()) {