From 13adc105197beba0b796525bce7446bb17767fde Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Apr 2025 17:16:46 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../flowable/config/FlowableUuidConfig.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java new file mode 100644 index 0000000000..590a719049 --- /dev/null +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.flowable.config; + +import org.flowable.common.engine.impl.persistence.StrongUuidGenerator; +import org.flowable.spring.SpringProcessEngineConfiguration; +import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * @description: + * @author: dimengzhe + * @date: 2025/4/21 + **/ +@Configuration +public class FlowableUuidConfig { + + @Bean + public SpringProcessEngineConfiguration processEngineConfiguration() { + SpringProcessEngineConfiguration config = new SpringProcessEngineConfiguration(); + config.setIdGenerator(new StrongUuidGenerator()); // 设置自定义的 UUID 生成器 + return config; + } +} From b80dd66b9de337a6d4f32731cc058cf46e84a920 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 21 Apr 2025 20:48:04 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yxt/anrui/flowable/config/FlowableUuidConfig.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java index 590a719049..7d2069f06a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/config/FlowableUuidConfig.java @@ -2,6 +2,7 @@ package com.yxt.anrui.flowable.config; import org.flowable.common.engine.impl.persistence.StrongUuidGenerator; import org.flowable.spring.SpringProcessEngineConfiguration; +import org.flowable.spring.boot.EngineConfigurationConfigurer; import org.flowable.spring.boot.ProcessEngineConfigurationConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -15,9 +16,7 @@ import org.springframework.context.annotation.Configuration; public class FlowableUuidConfig { @Bean - public SpringProcessEngineConfiguration processEngineConfiguration() { - SpringProcessEngineConfiguration config = new SpringProcessEngineConfiguration(); - config.setIdGenerator(new StrongUuidGenerator()); // 设置自定义的 UUID 生成器 - return config; + public EngineConfigurationConfigurer idGeneratorConfigurer() { + return configuration -> configuration.setIdGenerator(new StrongUuidGenerator()); } } From 2557bff42d90c42770c67f2f6cd9b4a723a5905b Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 08:58:09 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 e6fe9f4536..62e8f574da 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 HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0 ) a1 @@ -108,7 +108,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 From 14252d267b0866d6f467c8ea621ca94bea96a53c Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 09:30:24 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62e8f574da..ca9f2d3a73 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 @@ -92,7 +92,7 @@ ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1 WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数 GROUP BY lrpd.sid - HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0 + ) a1 LEFT JOIN ( SELECT From a17be50a2a7833ba18d3ac1089b5cb2fdcee3c97 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 09:39:15 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehService.java | 1 + 1 file changed, 1 insertion(+) 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 05200265f4..3819e7867f 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 @@ -173,6 +173,7 @@ public class LoanBeOverdueVehService { qw.groupBy("a1.loanContractNo"); qw.groupBy("a1.vinNo"); qw.groupBy("a1.busVinSid"); + qw.having("beOverdueMoney>0"); if (StringUtils.isNotBlank(query.getBeOverduePeriod())) { qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod()); } From 9fa439c2cac73aec4096114ce909eba43c30a8a8 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 09:44:56 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbeoverdueveh/LoanBeOverdueVehService.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 3819e7867f..aeb0ff6b1d 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 @@ -173,7 +173,11 @@ public class LoanBeOverdueVehService { qw.groupBy("a1.loanContractNo"); qw.groupBy("a1.vinNo"); qw.groupBy("a1.busVinSid"); - qw.having("beOverdueMoney>0"); + String havingSql = "ROUND(SUM(a1.yq_total) + " + + "COALESCE(lbpv_sum.bankBeInter_sum, 0) + " + + "CAST(COALESCE(lfd_sum.fund_sum, 0) AS DECIMAL(10,2)), 2) > 0"; + + qw.having(havingSql); if (StringUtils.isNotBlank(query.getBeOverduePeriod())) { qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod()); } From 9cf4e8415ca77fe787dd78a230df82fb5a681e81 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 09:49:44 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 4 ++-- .../biz/loanbeoverdueveh/LoanBeOverdueVehService.java | 5 ----- 2 files changed, 2 insertions(+), 7 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 ca9f2d3a73..2b1e70bdda 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,9 +90,9 @@ WHERE lbca.collMeasure LIKE '%远程控制%' AND lbca.nodeState = '已办结' ) lbcv ON lbcv.saleVehSid = lrpd.busVinSid AND lbcv.rn = 1 - WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数 + WHERE lrpd.dueDate <= lrpd.updateTime -- 移除DATE_FORMAT函数 GROUP BY lrpd.sid - + HAVING (lrpd.dueMoney - COALESCE(SUM(lrh.actualMoney), 0)) > 0 ) a1 LEFT JOIN ( SELECT 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 aeb0ff6b1d..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 @@ -173,11 +173,6 @@ public class LoanBeOverdueVehService { qw.groupBy("a1.loanContractNo"); qw.groupBy("a1.vinNo"); qw.groupBy("a1.busVinSid"); - String havingSql = "ROUND(SUM(a1.yq_total) + " + - "COALESCE(lbpv_sum.bankBeInter_sum, 0) + " + - "CAST(COALESCE(lfd_sum.fund_sum, 0) AS DECIMAL(10,2)), 2) > 0"; - - qw.having(havingSql); if (StringUtils.isNotBlank(query.getBeOverduePeriod())) { qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod()); } From 6c0232838719873a5acb73876f943096b3ccddbd Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 10:10:03 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRestoreReportApplyMapper.xml | 76 +++++++++++++++---- 1 file changed, 62 insertions(+), 14 deletions(-) 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 From 53049f71529a5f25e6036ad50c45a035b87fc5a2 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 22 Apr 2025 10:33:03 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chukuguanli/chukubanli/chukushenqingAdd.vue | 4 ++-- .../src/views/chukuguanli/chukubanli/chukushenqingInfo.vue | 4 ++-- .../workflow/chukuguanliFlow/chukuguanli/chukuDaiBanInfo.vue | 4 ++-- .../views/workflow/chukuguanliFlow/chukuguanli/chukuEdit.vue | 4 ++-- .../workflow/chukuguanliFlow/chukuguanli/chukuYiBanInfo.vue | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ From f8b1b10c271b8f1db2a460a8508e74b8243f0f63 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 11:05:17 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/anrui/flowable/biz/flowtask/FlowTaskService.java | 1 + .../com/yxt/anrui/flowable/config/FlowableUuidConfig.java | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 configuration.setIdGenerator(new StrongUuidGenerator()); } } +*/ From 368583df8bbb6b34774fed561c6bc6c6e7d0bdbf Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 22 Apr 2025 11:14:36 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loandiffdetails/LoanDiffDetailsMapper.xml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) 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}