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')").