Merge remote-tracking branch 'origin/master'

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
+        (SELECT
-        WHEN 0 THEN '未控制'
+        CASE
-        WHEN 1 THEN '控制成功'
+        lbcv.lockCarState
-        WHEN 2 THEN '控制失败'
+        WHEN 0
-        WHEN 3 THEN '已解控' END AS lockCarState
+        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.`bankContractNo`,
-                lrpd.dueDate,
-                lrpd.vehMark,
                 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,
+                lrpd.`paymentMoney` AS yd_dkje,
-                ct.mobile,
+                lrpd.fund AS yd_zjzyf,
+                lrpd.orgSidPath,
+                lrpd.createBySid,
+                bv.riskStaffUserSid,
+                bv.riskStaffUserName,
+                bv.reaRepaymentName,
                 lr.createTime,
-                lrpd.borrowerSid,
+                (SELECT
-                lrpd.salesOrderSid,
+                CASE
-                CASE lbcv.lockCarState
+                lbcv.lockCarState
-                WHEN 0 THEN '未控制'
+                WHEN 0
-                WHEN 1 THEN '控制成功'
+                THEN '未控制'
-                WHEN 2 THEN '控制失败'
+                WHEN 1
-                WHEN 3 THEN '已解控' END AS lockCarState
+                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

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrestorereportapply/LoanRestoreReportApplyMapper.xml

@@ -78,7 +78,9 @@
 	<select id="getYhjehsqs" resultType="java.lang.String">
 		SELECT
 				ROUND(
-						IFNULL(SUM(lrh.`actualMoney`), 0) / lrs.mainMidRepay,
+						IFNULL(SUM(lrh.`actualMoney`), 0) / (
+								IFNULL(lrs.mainMidRepay, 0) + IFNULL(lrs.otherMidRepay, 0)
+								),
 						1
 						)
 		FROM