From 679a524e394f68793cc8648b903cfe223d63f7fb Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 17 Apr 2024 13:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FinCollectionConfirmationService.java                     | 4 ++--
 doc/databases/统计报表更新.sql                          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index b5dd939aba..22e19256b2 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -1757,12 +1757,12 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     if (loanSolutionsDetail.getBondAmounts() != null) {
                         bigAdd = bigAdd.add(loanSolutionsDetail.getBondAmounts());
                     }
-                    if (loanSolutions.getFactoryDiscount() != null) {
+                    if (loanSolutions.getActualDiscount() != null) {
                         bigAdd = bigAdd.add(loanSolutions.getActualDiscount());
                     }
 
                     if (loanSolutionsOtherpolicy != null) {
-                        if (loanSolutionsOtherpolicy.getOtherDiscount() != null) {
+                        if (loanSolutionsOtherpolicy.getOtherActualDiscount() != null) {
                             bigAdd = bigAdd.add(loanSolutionsOtherpolicy.getOtherActualDiscount());
                         }
                     }
diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 34177f347d..418eb7d92f 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -1105,7 +1105,7 @@ BEGIN
                        WHERE bo.payTypeKey = 2
                          and ss.busVinSid is null
                          AND bbv.vehicleState = '0002'
-                         and bo.nodeState = '已办结'
+                         and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
                        GROUP BY bv.sid,
                                 bo.useOrgSid,
                                 bm.modelSid,
@@ -1216,7 +1216,7 @@ BEGIN
                        WHERE bo.payTypeKey = 2
                          and ss.busVinSid is null
                          AND bbv.vehicleState = '0002'
-                         and bo.nodeState = '已办结'
+                         and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
                        GROUP BY bv.sid,
                                 bo.useOrgSid,
                                 bm.modelSid,