From 02624f0a19e571c6493b80bbc7ffd4dc5dbf33d5 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Mon, 22 Jan 2024 15:55:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanBeOverdueVehMapper.xml | 94 +++++++++++++------ .../LoanRestoreReportApplyMapper.xml | 4 +- 2 files changed, 69 insertions(+), 29 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 7a28e723f1..845d903506 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 @@ -40,7 +40,8 @@ 0 ) ) AS beOverdueMoney, - ROUND(( + ROUND( + ( SUM(a1.yq_total) + IFNULL( (SELECT SUM(lbpv.`bankBeInter`) @@ -61,7 +62,9 @@ WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE())), 0 ) - ) / a1.qjyh, 1) AS beOverdueMoneyAndPeriod, + ) / a1.qjyh, + 1 + ) AS beOverdueMoneyAndPeriod, SUM(a1.yd_dkje) AS advMoney, SUM(a1.yd_zjzyf) AS fundPossCostMoney, a1.riskStaffUserSid, @@ -84,7 +87,9 @@ lrpd.`bankContractNo`, lrpd.dueMoney, lrpd.dueDate, - (IFNULL(lrs.mainMidRepay,0) + IFNULL(lrs.otherMidRepay,0)) AS qjyh, + ( + IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0) + ) AS qjyh, ( lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) ) AS yq_total, @@ -99,19 +104,33 @@ bv.riskStaffUserName, bv.reaRepaymentName, lr.createTime, - CASE lbcv.lockCarState - WHEN 0 THEN '未控制' - WHEN 1 THEN '控制成功' - WHEN 2 THEN '控制失败' - WHEN 3 THEN '已解控' END AS lockCarState + (SELECT + CASE + lbcv.lockCarState + WHEN 0 + THEN '未控制' + WHEN 1 + THEN '控制成功' + WHEN 2 + THEN '控制失败' + WHEN 3 + THEN '已解控' + END AS lockCarState + FROM + loan_be_collection_veh lbcv + LEFT JOIN loan_be_collection_apply lbca + ON lbca.sid = lbcv.mainSid + WHERE lbca.collMeasure LIKE '%远程控制%' + AND lbca.nodeState = '已办结' + AND lbcv.saleVehSid = lrpd.busVinSid + ORDER BY lbca.createTime DESC + LIMIT 1) AS lockCarState FROM `loan_repayment_plan_details` lrpd LEFT JOIN `loan_repayment_history` lrh ON lrh.planDetailSid = lrpd.`sid` LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv ON lrpd.busVinSid = bv.sid - LEFT JOIN loan_be_collection_veh lbcv - ON lrpd.busVinSid = lbcv.saleVehSid LEFT JOIN loan_repayment_schedule lrs ON lrpd.scheduleSid = lrs.sid LEFT JOIN @@ -203,39 +222,60 @@ (SELECT lrpd.sid, lrpd.busVinSid, + lrpd.`useOrgName`, + lrpd.`dept`, lrpd.`loanContractNo`, - lrpd.`bankContractNo`, + lrpd.borrowerName, lrpd.`vinNo`, + lrpd.`vehMark`, lrpd.`bankName`, - lrpd.borrowerName, - lrpd.dueDate, - lrpd.vehMark, + lrpd.`bankContractNo`, lrpd.dueMoney, - (IFNULL(lrs.mainMidRepay,0) + IFNULL(lrs.otherMidRepay,0)) AS qjyh, + lrpd.dueDate, + ( + IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0) + ) AS qjyh, ( lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) ) AS yq_total, ( lrpd.`dueMoney` - SUM(IFNULL(lrh.actualMoney, 0)) ) / lrpd.`dueMoney` AS yq_hsqs, - lrpd.customer, - ct.mobile, + lrpd.`paymentMoney` AS yd_dkje, + lrpd.fund AS yd_zjzyf, + lrpd.orgSidPath, + lrpd.createBySid, + bv.riskStaffUserSid, + bv.riskStaffUserName, + bv.reaRepaymentName, lr.createTime, - lrpd.borrowerSid, - lrpd.salesOrderSid, - CASE lbcv.lockCarState - WHEN 0 THEN '未控制' - WHEN 1 THEN '控制成功' - WHEN 2 THEN '控制失败' - WHEN 3 THEN '已解控' END AS lockCarState + (SELECT + CASE + lbcv.lockCarState + WHEN 0 + THEN '未控制' + WHEN 1 + THEN '控制成功' + WHEN 2 + THEN '控制失败' + WHEN 3 + THEN '已解控' + END AS lockCarState + FROM + loan_be_collection_veh lbcv + LEFT JOIN loan_be_collection_apply lbca + ON lbca.sid = lbcv.mainSid + WHERE lbca.collMeasure LIKE '%远程控制%' + AND lbca.nodeState = '已办结' + AND lbcv.saleVehSid = lrpd.busVinSid + ORDER BY lbca.createTime DESC + LIMIT 1) AS lockCarState FROM `loan_repayment_plan_details` lrpd LEFT JOIN `loan_repayment_history` lrh ON lrh.planDetailSid = lrpd.`sid` LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv ON lrpd.busVinSid = bv.sid - LEFT JOIN loan_be_collection_veh lbcv - ON lrpd.busVinSid = lbcv.saleVehSid LEFT JOIN loan_repayment_schedule lrs ON lrpd.scheduleSid = lrs.sid LEFT JOIN @@ -247,8 +287,6 @@ ORDER BY createTime DESC LIMIT 1) lr ON lrpd.busVinSid = lr.saleVehSid - LEFT JOIN anrui_crm.`crm_customer_temp` ct - ON lrpd.customerSid = ct.sid WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < CURDATE() GROUP BY lrpd.`sid` HAVING (yq_total > 0)) a1 diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml index ce579feb1c..5a6eb4b929 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml @@ -78,7 +78,9 @@