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..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 @@ -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, @@ -168,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 @@ -233,6 +235,7 @@ ) a1 WHERE a1.borrowerSid = #{borrowerSid} + AND a1.nowOverdue = 0 GROUP BY a1.loanContractNo, a1.vinNo, @@ -283,7 +286,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 +317,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')"). 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 - * 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 { @@ -351,7 +338,7 @@ public class LoanRestoreReportApplyService extends MybatisBaseService ${ew.sqlSegment} @@ -68,83 +68,37 @@