diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
index ecc577e06b..416a23e020 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue
@@ -178,12 +178,12 @@
- {{ scope.row.realBuyer.zlStateValue }}
+ {{ scope.row.zlStateValue }}
- {{ scope.row.realBuyer.bankStateValue }}
+ {{ scope.row.bankStateValue }}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
index 6a234a5b4a..8f95561e66 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue
@@ -148,12 +148,12 @@
- {{ scope.row.realBuyer.zlStateValue }}
+ {{ scope.row.zlStateValue }}
- {{ scope.row.realBuyer.bankStateValue }}
+ {{ scope.row.bankStateValue }}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
index e76f50e05f..3a47947ba1 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue
@@ -153,12 +153,12 @@
- {{ scope.row.realBuyer.zlStateValue }}
+ {{ scope.row.zlStateValue }}
- {{ scope.row.realBuyer.bankStateValue }}
+ {{ scope.row.bankStateValue }}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
index 8979ced91a..696bf9718f 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue
@@ -177,12 +177,12 @@
- {{ scope.row.realBuyer.zlStateValue }}
+ {{ scope.row.zlStateValue }}
- {{ scope.row.realBuyer.bankStateValue }}
+ {{ scope.row.bankStateValue }}
diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
index 0d79512d4b..242f8a11d7 100644
--- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
+++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue
@@ -151,12 +151,12 @@
- {{ scope.row.realBuyer.zlStateValue }}
+ {{ scope.row.zlStateValue }}
- {{ scope.row.realBuyer.bankStateValue }}
+ {{ scope.row.bankStateValue }}
diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index f027afe042..20e6a9d1da 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -1713,6 +1713,7 @@ public class FlowTaskService extends MybatisBaseService idGeneratorConfigurer() {
+ return configuration -> configuration.setIdGenerator(new StrongUuidGenerator());
+ }
+}
+*/
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 d42a6eb4ef..2146b7441a 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
@@ -90,7 +90,7 @@
WHERE lbca.collMeasure LIKE '%远程控制%'
AND lbca.nodeState = '已办结'
) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1
- WHERE lrpd.dueDate < CURDATE() -- 移除DATE_FORMAT函数
+ WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数
GROUP BY lrpd.sid
(lrpd.dueMoney - SUM(IFNULL(lrh.actualMoney, 0))) > 0
HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0
@@ -109,7 +109,7 @@
FROM loan_fund_day lfd
JOIN loan_repayment_plan_details lrpd
ON lrpd.sid = lfd.busSid
- WHERE lrpd.dueDate < CURDATE()
+ WHERE lrpd.dueDate <= lrpd.updateTime
GROUP BY lrpd.busVinSid
) lfd_sum ON lfd_sum.busVinSid = a1.busVinSid
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml
index 89eb11406a..d8f15e8d61 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loandiffdetails/LoanDiffDetailsMapper.xml
@@ -11,7 +11,7 @@
select vinNo vin,
bankName zf,
borrowName loanName,
- makeLoan fk1,
+
+ IFNULL(makeLoan, 0) AS fk1,
+ IFNULL(realityLoan, 0) AS fk2,
+ IFNULL(diffLoan, 0) AS diffFk,
+ IFNULL(makeDiscount, 0) AS mainTx1,
+ IFNULL(realityDiscount, 0) AS mainTx2,
+ IFNULL(diffDiscount, 0) AS diffMainTx,
+ IFNULL(makeLoanMargin, 0) AS dkbzj1,
+ IFNULL(realityLoanMargin, 0) AS dkbzj2,
+ IFNULL(diffLoanMargin, 0) AS diffDkbzj,
+ IFNULL(makeOtherDiscount, 0) AS otherTx1,
+ IFNULL(realityOtherDiscount, 0) AS otherTx2,
+ IFNULL(diffOtherDiscount, 0) AS diffOtherTx,
+ IFNULL(receivedPremium, 0) AS ywx1,
+ IFNULL(realityPremium, 0) AS ywx2,
+ IFNULL(diffPremium, 0) AS diffYwx
from anrui_riskcenter.loan_diff_details
where mainSid = #{sid}
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 3108e8b0cc..76feaebc0c 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
@@ -266,13 +266,37 @@
GROUP BY saleVehSid
) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
LEFT JOIN (
- SELECT
- lrpd.busVinSid,
- SUM(lfd.fund) AS fund_sum
- FROM loan_fund_day lfd
- JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid
- WHERE lrpd.dueDate <= lrpd.updateTime
- GROUP BY lrpd.busVinSid
+ SELECT
+ a.busVinSid,
+ sum( a.fund ) AS fund_sum
+ FROM
+ (
+ SELECT
+ ( fjj.reveivableMoney - fjj.m ) AS fund,
+ lp.busVinSid
+ 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
+ LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
+ where lp.dueDate <= lp.updateTime
+ GROUP BY
+ lp.busVinSid
+ ) a
) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
GROUP BY ss.busVinSid
@@ -309,13 +333,37 @@
GROUP BY saleVehSid
) lbpv_sum ON lbpv_sum.saleVehSid = ss.busVinSid
LEFT JOIN (
- SELECT
- lrpd.busVinSid,
- SUM(lfd.fund) AS fund_sum
- FROM loan_fund_day lfd
- JOIN loan_repayment_plan_details lrpd ON lrpd.sid = lfd.busSid
- WHERE lrpd.dueDate <= lrpd.updateTime
- GROUP BY lrpd.busVinSid
+ SELECT
+ a.busVinSid,
+ sum( a.fund ) AS fund_sum
+ FROM
+ (
+ SELECT
+ ( fjj.reveivableMoney - fjj.m ) AS fund,
+ lp.busVinSid
+ 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
+ LEFT JOIN loan_repayment_plan_details lp ON lp.sid = fjj.busSid
+ where lp.dueDate <= lp.updateTime
+ GROUP BY
+ lp.busVinSid
+ ) a
) lfd_sum ON lfd_sum.busVinSid = ss.busVinSid
GROUP BY ss.busVinSid