From e647f5a8c848a63da65b0f41bc1c35e8541dbd44 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 21 Apr 2025 15:20:16 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeOverdueVehMapper.xml | 85 +------------------ .../LoanBeOverdueVehService.java | 2 + 2 files changed, 5 insertions(+), 82 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 568a9c30ca..6edec5d5ae 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -283,7 +283,8 @@ MAX(a1.reaRepaymentName) AS repaymentName, MAX(a1.createTime) AS createTime, a1.orgSidPath, - MAX(a1.lockCarState) AS lockCarState -- 保证聚合正确性 + MAX(a1.lockCarState) AS lockCarState, -- 保证聚合正确性 + a1.nowOverdue FROM ( SELECT lrpd.sid, @@ -313,87 +314,7 @@ WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' END AS lockCarState, - CASE - WHEN lrpd.dueDate > lrpd.updateTime or lrpd.updateTime IS NULL THEN '1' - WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL( - ( - lrpd.dueMoney - IFNULL(( - SELECT - SUM( - IFNULL( lrh.actualMoney, 0 )) - FROM - loan_repayment_history AS lrh - WHERE - lrh.planDetailSid = lrpd.sid - AND lrh.updateState = '1' - ), - 0 - )), - 0 - ) + IFNULL(( - SELECT - ( fjj.reveivableMoney - fjj.m ) - FROM - ( - SELECT - IFNULL(( - SELECT - SUM( subscriptionMoney ) - FROM - anrui_fin.fin_selected_receivables_detailed AS s - WHERE - s.auditState = '3' - AND s.receivablesSid = fj.sid - ), - 0 - ) AS m, - fj.* - FROM - ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj - ) AS fjj - WHERE - fjj.busSid = lrpd.sid - ),0) + IFNULL(lrpd.paymentInterest,0)) > 0 THEN '0' - WHEN lrpd.dueDate <= lrpd.updateTime AND (IFNULL( - ( - lrpd.dueMoney - IFNULL(( - SELECT - SUM( - IFNULL( lrh.actualMoney, 0 )) - FROM - loan_repayment_history AS lrh - WHERE - lrh.planDetailSid = lrpd.sid - AND lrh.updateState = '1' - ), - 0 - )), - 0 - ) + IFNULL(( - SELECT - ( fjj.reveivableMoney - fjj.m ) - FROM - ( - SELECT - IFNULL(( - SELECT - SUM( subscriptionMoney ) - FROM - anrui_fin.fin_selected_receivables_detailed AS s - WHERE - s.auditState = '3' - AND s.receivablesSid = fj.sid - ), - 0 - ) AS m, - fj.* - FROM - ( SELECT j.busSid, j.sid, j.reveivableMoney FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS j WHERE j.payCostTitleKey = '006' ) AS fj - ) AS fjj - WHERE - fjj.busSid = lrpd.sid - ),0) + IFNULL(lrpd.paymentInterest,0)) <= 0 THEN '1' - END AS nowOverdue + if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue FROM loan_repayment_plan_details lrpd LEFT JOIN loan_repayment_history lrh ON lrh.planDetailSid = lrpd.sid diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java index 07aeb2f54e..05200265f4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java @@ -164,6 +164,7 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getNames())) { qw.and(wrapper -> wrapper.like("a1.loanContractNo", query.getNames()).or().like("a1.borrowerName", query.getNames()).or().like("a1.vinNo", query.getNames())); } + qw.eq("a1.nowOverdue", "0"); String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). @@ -283,6 +284,7 @@ public class LoanBeOverdueVehService { if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("a1.vinNo", query.getVinNo()); } + qw.eq("a1.nowOverdue", "0"); String collectionStartDate = query.getCollectionStartDate(); String collectionEndDate = query.getCollectionEndDate(); qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')"). From ec4f6f14e7afdec525e5b6614684ff8491834987 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 21 Apr 2025 15:36:34 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 6edec5d5ae..7a76b8bc1a 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -147,7 +147,8 @@ ) AS beOverdueMoneyAndPeriod, a1.busVinSid AS saleVehSid, MAX(a1.salesOrderSid) AS salesOrderSid, - MAX(a1.lockCarState) AS lockCarState + MAX(a1.lockCarState) AS lockCarState, + a1.nowOverdue FROM ( SELECT lrpd.sid, @@ -185,7 +186,8 @@ WHEN 1 THEN '控制成功' WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' - END AS lockCarState + END AS lockCarState, + if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue FROM ( SELECT lbcv.saleVehSid, @@ -233,6 +235,7 @@ ) a1 WHERE a1.borrowerSid = #{borrowerSid} + a1.nowOverdue = 0 GROUP BY a1.loanContractNo, a1.vinNo, From 1e3e76194ee2351076960ba70083fecda77c14b2 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 21 Apr 2025 15:45:11 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml index 7a76b8bc1a..e6fe9f4536 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml @@ -169,7 +169,8 @@ ct.mobile, lrpd.borrowerSid, lrpd.salesOrderSid, - lbcv_agg.lockCarState + lbcv_agg.lockCarState, + if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue FROM loan_repayment_plan_details lrpd LEFT JOIN loan_repayment_history lrh @@ -186,8 +187,7 @@ WHEN 1 THEN '控制成功' WHEN 2 THEN '控制失败' WHEN 3 THEN '已解控' - END AS lockCarState, - if(lrpd.dueDate <= lrpd.updateTime,0,1) as nowOverdue + END AS lockCarState FROM ( SELECT lbcv.saleVehSid, @@ -235,7 +235,7 @@ ) a1 WHERE a1.borrowerSid = #{borrowerSid} - a1.nowOverdue = 0 + AND a1.nowOverdue = 0 GROUP BY a1.loanContractNo, a1.vinNo, From 7a7122fa8dfc7431a723f64452d830f7e31dfd4e Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 21 Apr 2025 16:02:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loanrestorereportapply/LoanRestoreReportApplyService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index c3e5d2493b..bcce860188 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java @@ -351,7 +351,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService Date: Mon, 21 Apr 2025 17:00:13 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=8E=E5=9B=9E?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=BE=E6=9C=9F=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanlawsuitapply/LoanLawsuitApplyService.java | 2 +- .../biz/loanredemptionapply/LoanRedemptionApplyService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java index 389dcc732b..82910874f1 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanlawsuitapply/LoanLawsuitApplyService.java @@ -223,7 +223,7 @@ public class LoanLawsuitApplyService extends MybatisBaseService Date: Mon, 21 Apr 2025 17:02:10 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRestoreReportApplyService.java | 13 --- .../LoanVehClearanceApplyMapper.xml | 84 +++++-------------- .../LoanVehClearanceApplyService.java | 7 ++ 3 files changed, 27 insertions(+), 77 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java index bcce860188..2a3c9a017c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyService.java @@ -87,19 +87,6 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; -/** - * Project: anrui-riskcenter(车辆交回事前报备申请)
- * File: LoanRestoreReportApplyService.java
- * Class: com.yxt.anrui.riskcenter.biz.loanrestorereportapply.LoanRestoreReportApplyService
- * Description: 车辆交回事前报备申请 业务逻辑.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-01-08 11:43:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Service public class LoanRestoreReportApplyService extends MybatisBaseService { diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml index 655f7d37d0..e170682910 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanvehclearanceapply/LoanVehClearanceApplyMapper.xml @@ -37,7 +37,7 @@ lv.borrowerName FROM loan_be_collection_veh lv LEFT JOIN loan_be_collection_apply la - ON lv.`mainSid` = la.`sid` + ON lv.mainSid = la.sid ${ew.sqlSegment} @@ -68,83 +68,37 @@