From e6143650e77ebad21b3ba4dc878cd5664d0af7b2 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Tue, 12 Dec 2023 15:24:45 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E8=BD=A6=E8=BE=86?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=85=B3=E8=81=94=E5=82=AC=E6=94=B6=E8=A1=A8?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E5=82=AC=E6=94=B6=E6=97=A5=E6=9C=9F=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=85=B3=E8=81=94=E9=94=80?=
=?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=BD=A6=E8=BE=86=E8=A1=A8=E4=BC=98?=
=?UTF-8?q?=E5=8C=96=E9=A3=8E=E6=8E=A7=E4=B8=93=E5=91=98=E6=9F=A5=E8=AF=A2?=
=?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../loanbeoverdueveh/LoanBeOverdueVehQuery.java | 4 ++++
.../api/loanbeoverdueveh/LoanBeOverdueVehVo.java | 2 +-
.../loanbeoverdueveh/LoanBeOverdueVehMapper.xml | 16 +++++++++++++---
.../LoanBeOverdueVehService.java | 8 ++++++++
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java
index cf15f7325c..7269c6df68 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehQuery.java
@@ -29,6 +29,10 @@ public class LoanBeOverdueVehQuery implements Query {
private String beOverdueMoney;
@ApiModelProperty("逾期金额换算期数")
private String beOverdueMoneyAndPeriod;
+ @ApiModelProperty("最近催收开始日期")
+ private String collectionStartDate;
+ @ApiModelProperty("最近催收结束日期")
+ private String collectionEndDate;
@ApiModelProperty("风控专员")
private String riskStaffName;
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java
index 952734af3b..3bf1752a73 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehVo.java
@@ -43,5 +43,5 @@ public class LoanBeOverdueVehVo implements Vo {
@ApiModelProperty("资金占用费")
private String fundPossCostMoney;
@ApiModelProperty("风控专员")
- private String riskStaffName;
+ private String riskStaffUserName;
}
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 a8808d8b13..0665bb0787 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
@@ -7,7 +7,7 @@
From 0a2f66af296f209cd5712911afed8dcf19f8f58a Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 08:58:58 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 10cc070982..e112a3bc71 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -107,9 +107,12 @@
(
SELECT count(ddr.vehModelSid)
FROM daily_report ddr
+ left join anrui_base.base_model_config bmv on ddr.vehMConfigSid = bmv.sid
+ left join anrui_base.base_vehicle_model bm on bm.sid = ddr.vehModelSid
WHERE ddr.brandSid = dr.brandSid
AND DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
and ddr.busOrgSid = #{sybOrgSid}
+ group by bm.fuelTypeValue,bm.emissionStandardValue
) as colspan
FROM daily_report dr
WHERE dr.busOrgSid = #{sybOrgSid}
From 2e06fb3fa3bd4814dd229a5e447aaadd985829d4 Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 09:03:03 +0800
Subject: [PATCH 07/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index e112a3bc71..132677d1f9 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -105,7 +105,7 @@
SELECT dr.brandSid linkSid,
dr.brandName NAME,
(
- SELECT count(ddr.vehModelSid)
+ SELECT count(bm.fuelTypeValue)
FROM daily_report ddr
left join anrui_base.base_model_config bmv on ddr.vehMConfigSid = bmv.sid
left join anrui_base.base_vehicle_model bm on bm.sid = ddr.vehModelSid
From 0dec609f9a5ad836a0207bffc79724e07bbaeded Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 09:49:47 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../reportcenter/biz/dailyreport/DailyReportMapper.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 132677d1f9..3f0a02127b 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -105,14 +105,14 @@
SELECT dr.brandSid linkSid,
dr.brandName NAME,
(
- SELECT count(bm.fuelTypeValue)
+ SELECT count(ddr.id)
FROM daily_report ddr
left join anrui_base.base_model_config bmv on ddr.vehMConfigSid = bmv.sid
left join anrui_base.base_vehicle_model bm on bm.sid = ddr.vehModelSid
WHERE ddr.brandSid = dr.brandSid
AND DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
and ddr.busOrgSid = #{sybOrgSid}
- group by bm.fuelTypeValue,bm.emissionStandardValue
+ group by (bm.fuelTypeValue+bm.emissionStandardValue)
) as colspan
FROM daily_report dr
WHERE dr.busOrgSid = #{sybOrgSid}
@@ -182,7 +182,7 @@
#{item}
- group by bm.fuelTypeValue,bm.emissionStandardValue
+ group by (bm.fuelTypeValue+bm.emissionStandardValue)
order by dr.brandSid desc
From 9ead35b6e14cb1b5cc746bb2158af288be02a89e Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 10:51:26 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../biz/dailyreport/DailyReportMapper.xml | 37 +++++++++++++------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 3f0a02127b..49cc402d24 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -104,17 +104,32 @@
From 839ea3e5e2fff6f0c2a8e5e0c7c9bb3e98c0ac7c Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 10:55:26 +0800
Subject: [PATCH 10/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 49cc402d24..785bb87996 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -197,7 +197,7 @@
#{item}
- group by bm.fuelTypeValue,bm.emissionStandardValue
+ group by dr.brandSid,bm.fuelTypeValue,bm.emissionStandardValue
order by dr.brandSid desc
From 17d6051e12c463aa6c439e566bb499e0f8114cd1 Mon Sep 17 00:00:00 2001
From: dimengzhe
Date: Wed, 13 Dec 2023 11:10:19 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../biz/dailyreport/DailyReportMapper.xml | 135 +++++++++++++-----
1 file changed, 99 insertions(+), 36 deletions(-)
diff --git a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
index 785bb87996..fcf2b68a40 100644
--- a/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
+++ b/anrui-reportcenter/anrui-reportcenter-biz/src/main/java/com/yxt/anrui/reportcenter/biz/dailyreport/DailyReportMapper.xml
@@ -106,30 +106,25 @@
dr.brandName NAME,
b.colspan
FROM daily_report dr
- left join
- (
- select
- count(a.brandSid) as colspan,
- a.brandSid
- from
- (SELECT
- ddr.brandSid
- FROM
- daily_report ddr
- left join
- anrui_base.base_model_config bmv
- on ddr.vehMConfigSid = bmv.sid
- left join
- anrui_base.base_vehicle_model bm
- on bm.sid = ddr.vehModelSid
- WHERE
- DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
- and ddr.busOrgSid = #{sybOrgSid}
- group by
- ddr.brandSid,
- bm.fuelTypeValue,
- bm.emissionStandardValue )a group by a.brandSid) b
- on b.brandSid = dr.brandSid
+ left join
+ (
+ select count(a.brandSid) as colspan,
+ a.brandSid
+ from (SELECT ddr.brandSid
+ FROM daily_report ddr
+ left join
+ anrui_base.base_model_config bmv
+ on ddr.vehMConfigSid = bmv.sid
+ left join
+ anrui_base.base_vehicle_model bm
+ on bm.sid = ddr.vehModelSid
+ WHERE DATE_FORMAT(ddr.createTime, '%Y-%m-%d') = #{queryTime}
+ and ddr.busOrgSid = #{sybOrgSid}
+ group by ddr.brandSid,
+ bm.fuelTypeValue,
+ bm.emissionStandardValue) a
+ group by a.brandSid) b
+ on b.brandSid = dr.brandSid
WHERE dr.busOrgSid = #{sybOrgSid}
AND DATE_FORMAT(dr.createTime, '%Y-%m-%d') = #{queryTime}
GROUP BY dr.brandSid
@@ -197,7 +192,7 @@
#{item}
- group by dr.brandSid,bm.fuelTypeValue,bm.emissionStandardValue
+ group by dr.brandSid, bm.fuelTypeValue, bm.emissionStandardValue
order by dr.brandSid desc
@@ -407,14 +402,34 @@
\ No newline at end of file
From 1d5f1d816648c1dd6ba4bf76693b00a3ca7383bf Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Dec 2023 15:30:56 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E9=80=BE=E6=9C=9F=E8=BD=A6=E8=BE=86?=
=?UTF-8?q?=E9=A3=8E=E6=8E=A7=E4=B8=93=E5=91=98=E5=88=97=E8=A1=A8=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=20=E9=80=BE=E6=9C=9F=E5=82=AC?=
=?UTF-8?q?=E6=94=B6=E5=BD=95=E5=85=A5=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=20=E6=9C=88=E8=BF=98=E6=98=8E?=
=?UTF-8?q?=E7=BB=86=E8=AF=A6=E6=83=85=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=BC=80=E5=8F=91=20=E9=80=BE=E6=9C=9F=E6=8E=AA=E6=96=BD?=
=?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LoanBeCollectionApply.java | 80 +++++++++++++
.../LoanBeCollectionApplyDetailsVo.java | 81 +++++++++++++
.../LoanBeCollectionApplyDto.java | 81 +++++++++++++
.../LoanBeCollectionApplyFeign.java | 78 +++++++++++++
.../LoanBeCollectionApplyFeignFallback.java | 72 ++++++++++++
.../LoanBeCollectionApplyQuery.java | 79 +++++++++++++
.../LoanBeCollectionApplyVo.java | 81 +++++++++++++
.../LoanBeCollectionRecordDetailsVo.java | 4 +-
.../LoanBeCollectionRecordInit.java | 4 +
.../LoanBeCollectionRecordVehInit.java | 44 +++++++
.../LoanBeCollectionVeh.java | 80 +++++++++++++
.../LoanBeCollectionVehDetailsVo.java | 81 +++++++++++++
.../LoanBeCollectionVehDto.java | 81 +++++++++++++
.../LoanBeCollectionVehFeign.java | 78 +++++++++++++
.../LoanBeCollectionVehFeignFallback.java | 72 ++++++++++++
.../LoanBeCollectionVehQuery.java | 79 +++++++++++++
.../LoanBeCollectionVehVo.java | 81 +++++++++++++
.../api/loanbeoverdueveh/AllocationQuery.java | 15 +++
.../LoanBeOverdueVehFegin.java | 6 +-
.../LoanRepaymentPlanDetailsFeign.java | 6 +-
...LoanRepaymentPlanDetailsFeignFallback.java | 5 +
.../MonRepayDetails.java | 41 +++++++
.../MonRepayPeriodDetails.java | 25 ++++
.../LoanBeCollectionApplyMapper.java | 65 +++++++++++
.../LoanBeCollectionApplyMapper.xml | 13 +++
.../LoanBeCollectionApplyRest.java | 100 ++++++++++++++++
.../LoanBeCollectionApplyService.java | 110 ++++++++++++++++++
.../LoanBeCollectionRecordService.java | 42 ++++++-
.../LoanBeCollectionVehMapper.java | 65 +++++++++++
.../LoanBeCollectionVehMapper.xml | 13 +++
.../LoanBeCollectionVehRest.java | 100 ++++++++++++++++
.../LoanBeCollectionVehService.java | 110 ++++++++++++++++++
.../LoanBeOverdueVehMapper.java | 5 +
.../LoanBeOverdueVehMapper.xml | 68 ++++++++++-
.../LoanBeOverdueVehRest.java | 12 +-
.../LoanBeOverdueVehService.java | 92 ++++++++++++---
.../LoanHomevisitInvestigateMapper.java | 3 +
.../LoanHomevisitInvestigateService.java | 4 +
.../LoanRepaymentPlanDetailsMapper.java | 6 +
.../LoanRepaymentPlanDetailsMapper.xml | 67 +++++++++++
.../LoanRepaymentPlanDetailsRest.java | 8 ++
.../LoanRepaymentPlanDetailsService.java | 9 ++
42 files changed, 2114 insertions(+), 32 deletions(-)
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApply.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDetailsVo.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDto.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/AllocationQuery.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayDetails.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayPeriodDetails.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
create mode 100644 anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApply.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApply.java
new file mode 100644
index 0000000000..0d11160424
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApply.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApply.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply
+ * Description: 逾期催收申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:19
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请", description = "逾期催收申请")
+@TableName("loan_be_collection_apply")
+public class LoanBeCollectionApply extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("创建人")
+ private String createByName; // 创建人
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("申请部门sid")
+ private String deptSid; // 申请部门sid
+ @ApiModelProperty("申请部门名称")
+ private String deptName; // 申请部门名称
+ @ApiModelProperty("催收措施")
+ private String collMeasure; // 催收措施
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid; // 分公司sid
+ @ApiModelProperty("分公司名称")
+ private String useOrgName; // 分公司名称
+ @ApiModelProperty("组织全路径")
+ private String orgPath; // 组织全路径
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstSid; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDetailsVo.java
new file mode 100644
index 0000000000..ff468a19af
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDetailsVo.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo
+ * Description: 逾期催收申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请 视图数据详情", description = "逾期催收申请 视图数据详情")
+public class LoanBeCollectionApplyDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人")
+ private String createByName; // 创建人
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("申请部门sid")
+ private String deptSid; // 申请部门sid
+ @ApiModelProperty("申请部门名称")
+ private String deptName; // 申请部门名称
+ @ApiModelProperty("催收措施")
+ private String collMeasure; // 催收措施
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid; // 分公司sid
+ @ApiModelProperty("分公司名称")
+ private String useOrgName; // 分公司名称
+ @ApiModelProperty("组织全路径")
+ private String orgPath; // 组织全路径
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstSid; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDto.java
new file mode 100644
index 0000000000..9ccae8fb12
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyDto.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto
+ * Description: 逾期催收申请 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请 数据传输对象", description = "逾期催收申请 数据传输对象")
+public class LoanBeCollectionApplyDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人")
+ private String createByName; // 创建人
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("申请部门sid")
+ private String deptSid; // 申请部门sid
+ @ApiModelProperty("申请部门名称")
+ private String deptName; // 申请部门名称
+ @ApiModelProperty("催收措施")
+ private String collMeasure; // 催收措施
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid; // 分公司sid
+ @ApiModelProperty("分公司名称")
+ private String useOrgName; // 分公司名称
+ @ApiModelProperty("组织全路径")
+ private String orgPath; // 组织全路径
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstSid; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java
new file mode 100644
index 0000000000..223e6a472c
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyFeign.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyFeign
+ * Description: 逾期催收申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "逾期催收申请")
+@FeignClient(
+ contextId = "anrui-riskcenter-LoanBeCollectionApply",
+ name = "anrui-riskcenter",
+ path = "v1/loanbecollectionapply",
+ fallback = LoanBeCollectionApplyFeignFallback.class)
+public interface LoanBeCollectionApplyFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java
new file mode 100644
index 0000000000..c982228b06
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyFeignFallback
+ * Description: 逾期催收申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanBeCollectionApplyFeignFallback implements LoanBeCollectionApplyFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-riskcenter/loanbecollectionapply/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(LoanBeCollectionApplyDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionapply/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionapply/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-riskcenter/loanbecollectionapply/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java
new file mode 100644
index 0000000000..8c66ed5982
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyQuery.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyQuery.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyQuery
+ * Description: 逾期催收申请 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:19
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请 查询条件", description = "逾期催收申请 查询条件")
+public class LoanBeCollectionApplyQuery implements Query {
+
+ @ApiModelProperty("创建人")
+ private String createByName; // 创建人
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("申请部门sid")
+ private String deptSid; // 申请部门sid
+ @ApiModelProperty("申请部门名称")
+ private String deptName; // 申请部门名称
+ @ApiModelProperty("催收措施")
+ private String collMeasure; // 催收措施
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid; // 分公司sid
+ @ApiModelProperty("分公司名称")
+ private String useOrgName; // 分公司名称
+ @ApiModelProperty("组织全路径")
+ private String orgPath; // 组织全路径
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstSid; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java
new file mode 100644
index 0000000000..7344db8b8f
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionApplyVo.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionapply;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo
+ * Description: 逾期催收申请 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收申请 视图数据对象", description = "逾期催收申请 视图数据对象")
+public class LoanBeCollectionApplyVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("创建人")
+ private String createByName; // 创建人
+ @ApiModelProperty("申请编号")
+ private String billNo; // 申请编号
+ @ApiModelProperty("申请部门sid")
+ private String deptSid; // 申请部门sid
+ @ApiModelProperty("申请部门名称")
+ private String deptName; // 申请部门名称
+ @ApiModelProperty("催收措施")
+ private String collMeasure; // 催收措施
+ @ApiModelProperty("分公司sid")
+ private String useOrgSid; // 分公司sid
+ @ApiModelProperty("分公司名称")
+ private String useOrgName; // 分公司名称
+ @ApiModelProperty("组织全路径")
+ private String orgPath; // 组织全路径
+ @ApiModelProperty("流程定义的id")
+ private String procDefId; // 流程定义的id
+ @ApiModelProperty("环节定义的sid")
+ private String nodeSid; // 环节定义的sid
+ @ApiModelProperty("流程实例的sid")
+ private String procInstSid; // 流程实例的sid
+ @ApiModelProperty("流程状态")
+ private String nodeState; // 流程状态
+ @ApiModelProperty("任务id")
+ private String taskId; // 任务id
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDetailsVo.java
index b1bc2a0f8f..d955a4c299 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDetailsVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordDetailsVo.java
@@ -76,8 +76,8 @@ public class LoanBeCollectionRecordDetailsVo implements Vo {
@ApiModelProperty("催收结果key")
private String collectionResultKey; // 催收结果key
@ApiModelProperty("催收结果value")
- private String collectionResultValue; // 催收结果value @ApiModelProperty("联系人key")
-
+ private String collectionResultValue; // 催收结果value
+ @ApiModelProperty("联系人key")
private String contactsKey; // 联系人key
@ApiModelProperty("联系人value")
private String contactsValue; // 联系人value
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordInit.java
index 7b9fd0663b..c2d7dbf493 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordInit.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordInit.java
@@ -3,6 +3,8 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
@Data
public class LoanBeCollectionRecordInit {
@@ -14,4 +16,6 @@ public class LoanBeCollectionRecordInit {
private String spouseName;
@ApiModelProperty("贷款人配偶联系电话")
private String spouseMobile;
+ @ApiModelProperty("逾期车辆列表")
+ private List loanBeCollectionRecordVehInitList;
}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
new file mode 100644
index 0000000000..d85212815b
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordVehInit.java
@@ -0,0 +1,44 @@
+package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class LoanBeCollectionRecordVehInit {
+
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("车牌号")
+ private String carNum;
+ @ApiModelProperty("客户名称")
+ private String custName;
+ @ApiModelProperty("联系电话")
+ private String custPhone;
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo;
+ @ApiModelProperty("资方")
+ private String bankName;
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate;
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod;
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney;
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod;
+
+ @ApiModelProperty("销售订单sid")
+ private String salesOrderSid;
+ @ApiModelProperty("销售订单车辆sid")
+ private String saleVehSid;
+ @ApiModelProperty("开票管理sid")
+ private String kpglSid;
+ @ApiModelProperty("月还明细sid")
+ private String yhmxSid;
+ @ApiModelProperty("金融方案sid")
+ private String jrfaSid;
+ @ApiModelProperty("家访考察报告sid")
+ private String kcbgSid;
+ @ApiModelProperty("家访考察资料sid")
+ private String kczlSid;
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java
new file mode 100644
index 0000000000..7ed6d0bc21
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVeh.java
@@ -0,0 +1,80 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVeh.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh
+ * Description: 逾期催收车辆.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆", description = "逾期催收车辆")
+@TableName("loan_be_collection_veh")
+public class LoanBeCollectionVeh extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("车牌号")
+ private String carNum; // 车牌号
+ @ApiModelProperty("客户姓名")
+ private String customerName; // 客户姓名
+ @ApiModelProperty("客户联系电话")
+ private String customerPhone; // 客户联系电话
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo; // 贷款合同编号
+ @ApiModelProperty("资方")
+ private String bankName; // 资方
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate; // 首次逾期日期
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney; // 逾期金额
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod; // 逾期期数
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+ @ApiModelProperty("锁车费用")
+ private String lockCarMoney; // 锁车费用
+ @ApiModelProperty("锁车状态")
+ private String lockCarState; // 锁车状态
+ @ApiModelProperty("催收申请sid")
+ private String mainSid; // 催收申请sid
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java
new file mode 100644
index 0000000000..1d84e3ad83
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
+ * Description: 逾期催收车辆 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 视图数据详情", description = "逾期催收车辆 视图数据详情")
+public class LoanBeCollectionVehDetailsVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("车牌号")
+ private String carNum; // 车牌号
+ @ApiModelProperty("客户姓名")
+ private String customerName; // 客户姓名
+ @ApiModelProperty("客户联系电话")
+ private String customerPhone; // 客户联系电话
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo; // 贷款合同编号
+ @ApiModelProperty("资方")
+ private String bankName; // 资方
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate; // 首次逾期日期
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney; // 逾期金额
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod; // 逾期期数
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+ @ApiModelProperty("锁车费用")
+ private String lockCarMoney; // 锁车费用
+ @ApiModelProperty("锁车状态")
+ private String lockCarState; // 锁车状态
+ @ApiModelProperty("催收申请sid")
+ private String mainSid; // 催收申请sid
+
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java
new file mode 100644
index 0000000000..8594dd487d
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDto.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehDto.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto
+ * Description: 逾期催收车辆 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 数据传输对象", description = "逾期催收车辆 数据传输对象")
+public class LoanBeCollectionVehDto implements Dto {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("车牌号")
+ private String carNum; // 车牌号
+ @ApiModelProperty("客户姓名")
+ private String customerName; // 客户姓名
+ @ApiModelProperty("客户联系电话")
+ private String customerPhone; // 客户联系电话
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo; // 贷款合同编号
+ @ApiModelProperty("资方")
+ private String bankName; // 资方
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate; // 首次逾期日期
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney; // 逾期金额
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod; // 逾期期数
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+ @ApiModelProperty("锁车费用")
+ private String lockCarMoney; // 锁车费用
+ @ApiModelProperty("锁车状态")
+ private String lockCarState; // 锁车状态
+ @ApiModelProperty("催收申请sid")
+ private String mainSid; // 催收申请sid
+
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
new file mode 100644
index 0000000000..cdfb88c1ca
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeign.java
@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehFeign.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign
+ * Description: 逾期催收车辆.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "逾期催收车辆")
+@FeignClient(
+ contextId = "anrui-riskcenter-LoanBeCollectionVeh",
+ name = "anrui-riskcenter",
+ path = "v1/loanbecollectionveh",
+ fallback = LoanBeCollectionVehFeignFallback.class)
+public interface LoanBeCollectionVehFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ @ResponseBody
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ @ResponseBody
+ public ResultBean save(@RequestBody LoanBeCollectionVehDto dto);
+
+ @ApiOperation("根据sid删除记录")
+ @DeleteMapping("/delBySids")
+ @ResponseBody
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ @ResponseBody
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
new file mode 100644
index 0000000000..3d96c21f70
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeignFallback
+ * Description: 逾期催收车辆.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean save(LoanBeCollectionVehDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-riskcenter/loanbecollectionveh/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchDetailsBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/fetchDetailsBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java
new file mode 100644
index 0000000000..297bf1a970
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehQuery.java
@@ -0,0 +1,79 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehQuery.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery
+ * Description: 逾期催收车辆 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 查询条件", description = "逾期催收车辆 查询条件")
+public class LoanBeCollectionVehQuery implements Query {
+
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("车牌号")
+ private String carNum; // 车牌号
+ @ApiModelProperty("客户姓名")
+ private String customerName; // 客户姓名
+ @ApiModelProperty("客户联系电话")
+ private String customerPhone; // 客户联系电话
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo; // 贷款合同编号
+ @ApiModelProperty("资方")
+ private String bankName; // 资方
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate; // 首次逾期日期
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney; // 逾期金额
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod; // 逾期期数
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+ @ApiModelProperty("锁车费用")
+ private String lockCarMoney; // 锁车费用
+ @ApiModelProperty("锁车状态")
+ private String lockCarState; // 锁车状态
+ @ApiModelProperty("催收申请sid")
+ private String mainSid; // 催收申请sid
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java
new file mode 100644
index 0000000000..742ca29134
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehVo.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionveh;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo
+ * Description: 逾期催收车辆 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "逾期催收车辆 视图数据对象", description = "逾期催收车辆 视图数据对象")
+public class LoanBeCollectionVehVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("车架号")
+ private String vinNo; // 车架号
+ @ApiModelProperty("车牌号")
+ private String carNum; // 车牌号
+ @ApiModelProperty("客户姓名")
+ private String customerName; // 客户姓名
+ @ApiModelProperty("客户联系电话")
+ private String customerPhone; // 客户联系电话
+ @ApiModelProperty("贷款合同编号")
+ private String loanContractNo; // 贷款合同编号
+ @ApiModelProperty("资方")
+ private String bankName; // 资方
+ @ApiModelProperty("首次逾期日期")
+ private String firstBeDate; // 首次逾期日期
+ @ApiModelProperty("逾期金额")
+ private String beOverdueMoney; // 逾期金额
+ @ApiModelProperty("逾期期数")
+ private String beOverduePeriod; // 逾期期数
+ @ApiModelProperty("逾期金额换算期数")
+ private String beOverdueMoneyAndPeriod; // 逾期金额换算期数
+ @ApiModelProperty("锁车费用")
+ private String lockCarMoney; // 锁车费用
+ @ApiModelProperty("锁车状态")
+ private String lockCarState; // 锁车状态
+ @ApiModelProperty("催收申请sid")
+ private String mainSid; // 催收申请sid
+
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/AllocationQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/AllocationQuery.java
new file mode 100644
index 0000000000..19e78533d2
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/AllocationQuery.java
@@ -0,0 +1,15 @@
+package com.yxt.anrui.riskcenter.api.loanbeoverdueveh;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AllocationQuery {
+
+ @ApiModelProperty("销售订单车辆sid")
+ private List saleVehSids;
+ @ApiModelProperty("用户sid")
+ private String userSid;
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java
index d4da78a57f..24cb580fb6 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbeoverdueveh/LoanBeOverdueVehFegin.java
@@ -22,7 +22,11 @@ public interface LoanBeOverdueVehFegin {
@PostMapping("/listPage")
public ResultBean> listPage(@RequestBody PagerQuery pq);
+ @ApiOperation("风控人员逾期车辆列表")
+ @PostMapping("/riskListPage")
+ public ResultBean> riskListPage(@RequestBody PagerQuery pq);
+
@ApiOperation("分配风控专员")
@PostMapping("/allocationRiskStaff")
- public ResultBean allocationRiskStaff(@RequestParam("saleVehSids") List saleVehSids, @RequestParam("userSid") String userSid);
+ public ResultBean allocationRiskStaff(@RequestBody AllocationQuery allocationQuery);
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java
index b83caebbe6..cf0d5c0711 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeign.java
@@ -30,11 +30,11 @@ public interface LoanRepaymentPlanDetailsFeign {
@ResponseBody
public ResultBean savePlanDetails(@RequestBody LoanRepaymentPlanDetailsDto dto);
-
@ApiOperation("删除还款计划表明细")
@DeleteMapping("/deletePlanDetails")
public ResultBean deletePlanDetails(@RequestParam("scheduleSid") String scheduleSid);
-
-
+ @ApiOperation("月还明细")
+ @DeleteMapping("/details")
+ public ResultBean details(@RequestParam("saleVehSid") String saleVehSid);
}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java
index 1c2c306906..b908f59dd1 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/LoanRepaymentPlanDetailsFeignFallback.java
@@ -26,4 +26,9 @@ public class LoanRepaymentPlanDetailsFeignFallback implements LoanRepaymentPlanD
public ResultBean deletePlanDetails(String scheduleSid) {
return null;
}
+
+ @Override
+ public ResultBean details(String saleVehSid) {
+ return null;
+ }
}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayDetails.java
new file mode 100644
index 0000000000..c1a6753018
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayDetails.java
@@ -0,0 +1,41 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+public class MonRepayDetails extends BaseEntity {
+
+ @ApiModelProperty("分公司")
+ private String useOrgName;
+ @ApiModelProperty("销售部门")
+ private String dept;
+ @ApiModelProperty("销售专员")
+ private String staffName;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("消贷合同编号")
+ private String loanContractNo;
+ @ApiModelProperty("资方名称")
+ private String bankName;
+ @ApiModelProperty("资方合同")
+ private String bankContractNo;
+ @ApiModelProperty("客户")
+ private String customer;
+ @ApiModelProperty("借款人名称")
+ private String borrowerName;
+ @ApiModelProperty("期数明细")
+ private List monRepayPeriodDetailsList;
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayPeriodDetails.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayPeriodDetails.java
new file mode 100644
index 0000000000..74cef3365d
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentplandetails/MonRepayPeriodDetails.java
@@ -0,0 +1,25 @@
+package com.yxt.anrui.riskcenter.api.loanrepaymentplandetails;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/8/16 14:34
+ */
+@Data
+public class MonRepayPeriodDetails extends BaseEntity {
+
+ @ApiModelProperty("期数")
+ private String period;
+ @ApiModelProperty("应还金额")
+ private BigDecimal dueMoney;
+ @ApiModelProperty("实收金额")
+ private BigDecimal receiptMoney;
+ @ApiModelProperty("未还金额")
+ private BigDecimal notRepaidMoney;
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java
new file mode 100644
index 0000000000..5ef0ac5b2d
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyMapper.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyMapper
+ * Description: 逾期催收申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanBeCollectionApplyMapper extends BaseMapper {
+
+ //@Update("update loan_be_collection_apply set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from loan_be_collection_apply")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml
new file mode 100644
index 0000000000..1609686bd5
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
new file mode 100644
index 0000000000..33e2d15cd9
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionapply;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyFeign;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyRest
+ * Description: 逾期催收申请.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "逾期催收申请")
+@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyRest")
+@RequestMapping("v1/loanbecollectionapply")
+public class LoanBeCollectionApplyRest implements LoanBeCollectionApplyFeign {
+
+ @Autowired
+ private LoanBeCollectionApplyService loanBeCollectionApplyService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = loanBeCollectionApplyService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody LoanBeCollectionApplyDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ loanBeCollectionApplyService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ loanBeCollectionApplyService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ LoanBeCollectionApplyDetailsVo vo = loanBeCollectionApplyService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
new file mode 100644
index 0000000000..0df6c0327a
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionapply/LoanBeCollectionApplyService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApply;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyQuery;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto;
+import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionApplyService.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionapply.LoanBeCollectionApplyService
+ * Description: 逾期催收申请 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanBeCollectionApplyService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(LoanBeCollectionApplyQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ LoanBeCollectionApplyQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(LoanBeCollectionApplyDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(LoanBeCollectionApplyDto dto){
+ LoanBeCollectionApply entity = new LoanBeCollectionApply();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(LoanBeCollectionApplyDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ LoanBeCollectionApply entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public LoanBeCollectionApplyDetailsVo fetchDetailsVoBySid(String sid){
+ LoanBeCollectionApply entity = fetchBySid(sid);
+ LoanBeCollectionApplyDetailsVo vo = new LoanBeCollectionApplyDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
index 960ae9b618..bc51b223c8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordService.java
@@ -28,8 +28,12 @@ package com.yxt.anrui.riskcenter.biz.loanbecollectionrecord;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoice;
+import com.yxt.anrui.fin.api.finvehicleinvoice.FinVehicleInvoiceFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
@@ -38,8 +42,13 @@ import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomer;
import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.biz.loanbeoverdueveh.LoanBeOverdueVehService;
import com.yxt.anrui.riskcenter.biz.loanfile.LoanFileService;
+import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigate.LoanHomevisitInvestigateService;
import com.yxt.anrui.riskcenter.biz.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerService;
+import com.yxt.anrui.riskcenter.biz.loansolutions.LoanSolutionsService;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@@ -82,6 +91,16 @@ public class LoanBeCollectionRecordService extends MybatisBaseService createQueryWrapper(LoanBeCollectionRecordQuery query) {
// todo: 这里根据具体业务调整查询条件
@@ -89,7 +108,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService qw = new QueryWrapper<>();
return qw;
}
-
+
public PagerVo listPageVo(PagerQuery pq) {
LoanBeCollectionRecordQuery query = pq.getParams();
QueryWrapper qw = createQueryWrapper(query);
@@ -98,7 +117,7 @@ public class LoanBeCollectionRecordService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null);
return p;
}
-
+
public void saveOrUpdateDto(LoanBeCollectionRecordDto dto){
String dtoSid = dto.getSid();
List loanBeCollectionRecordFileList = dto.getLoanBeCollectionRecordFileList();
@@ -176,6 +195,25 @@ public class LoanBeCollectionRecordService extends MybatisBaseService loanBeCollectionRecordVehInits = loanBeOverdueVehService.initVehListByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+ for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) {
+ BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData();
+ BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData();
+ //开票管理sid
+ FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData();
+ loanBeCollectionRecordVehInit.setKpglSid(finVehicleInvoice.getSid());
+ //月还明细sid
+ loanBeCollectionRecordVehInit.setYhmxSid(saleVehSid);
+ //金融方案sid
+ LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid());
+ loanBeCollectionRecordVehInit.setJrfaSid(loanSolutions.getSid());
+ //家访考察报告sid
+ String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid());
+ loanBeCollectionRecordVehInit.setKcbgSid(sid);
+ //家访考察资料sid
+ loanBeCollectionRecordVehInit.setKczlSid(sid);
+ }
+ loanBeCollectionRecordInit.setLoanBeCollectionRecordVehInitList(loanBeCollectionRecordVehInits);
return loanBeCollectionRecordInit;
}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
new file mode 100644
index 0000000000..e5c29daab2
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionveh;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehMapper.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehMapper
+ * Description: 逾期催收车辆.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface LoanBeCollectionVehMapper extends BaseMapper {
+
+ //@Update("update loan_be_collection_veh set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from loan_be_collection_veh")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
new file mode 100644
index 0000000000..d51e4ee803
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
new file mode 100644
index 0000000000..ec92590452
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehRest.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionveh;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehFeignFallback.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest
+ * Description: 逾期催收车辆.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "逾期催收车辆")
+@RestController("com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehRest")
+@RequestMapping("v1/loanbecollectionveh")
+public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign {
+
+ @Autowired
+ private LoanBeCollectionVehService loanBeCollectionVehService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = loanBeCollectionVehService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增或修改")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody LoanBeCollectionVehDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ loanBeCollectionVehService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ loanBeCollectionVehService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchDetailsBySid/{sid}")
+ public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid);
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
new file mode 100644
index 0000000000..ec05a99d7e
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionveh/LoanBeCollectionVehService.java
@@ -0,0 +1,110 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.biz.loanbecollectionveh;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVeh;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehQuery;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto;
+import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(催收措施申请)
+ * File: LoanBeCollectionVehService.java
+ * Class: com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService
+ * Description: 逾期催收车辆 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-12 16:06:20
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class LoanBeCollectionVehService extends MybatisBaseService {
+ private QueryWrapper createQueryWrapper(LoanBeCollectionVehQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ LoanBeCollectionVehQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public void saveOrUpdateDto(LoanBeCollectionVehDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ this.insertByDto(dto);
+ return;
+ }
+ this.updateByDto(dto);
+ }
+
+ public void insertByDto(LoanBeCollectionVehDto dto){
+ LoanBeCollectionVeh entity = new LoanBeCollectionVeh();
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.insert(entity);
+ }
+
+ public void updateByDto(LoanBeCollectionVehDto dto){
+ String dtoSid = dto.getSid();
+ if (StringUtils.isBlank(dtoSid)) {
+ return;
+ }
+ LoanBeCollectionVeh entity = fetchBySid(dtoSid);
+ BeanUtil.copyProperties(dto, entity, "id", "sid");
+ baseMapper.updateById(entity);
+ }
+
+ public LoanBeCollectionVehDetailsVo fetchDetailsVoBySid(String sid){
+ LoanBeCollectionVeh entity = fetchBySid(sid);
+ LoanBeCollectionVehDetailsVo vo = new LoanBeCollectionVehDetailsVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java
index a2535c5627..867870432b 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
import com.yxt.anrui.riskcenter.api.loanborrower.AppLoanBorrowerListVo;
import com.yxt.anrui.riskcenter.api.loanborrower.LoanBorrower;
@@ -12,10 +13,14 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
+import java.util.List;
+
@Mapper
public interface LoanBeOverdueVehMapper {
IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
void allocationRiskStaff(@Param("saleVehSid") String saleVehSid, @Param("userSid") String userSid, @Param("userName") String userName);
+
+ List initVehListByBorrSid(String borrowerSid);
}
\ No newline at end of file
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 f54d2c4a93..c3091aa4c9 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
@@ -10,7 +10,7 @@
a1.`dept`,
a1.`loanContractNo`,
a1.borrowerName,
- a1.`vinNo`,
+ RIGHT(a1.vinNo,8) AS vinNo,
a1.`bankName`,
a1.`bankContractNo`,
a1.dueMoney AS bankMonthRep,
@@ -20,8 +20,10 @@
SUM(a1.yq_hsqs) AS beOverdueMoneyAndPeriod,
SUM(a1.yd_dkje) AS advMoney,
SUM(a1.yd_zjzyf) AS fundPossCostMoney,
+ a1.riskStaffUserSid,
a1.riskStaffUserName,
- a1.createTime
+ a1.createTime,
+ a1.orgSidPath
FROM (SELECT lrpd.sid,
lrpd.busVinSid,
lrpd.`useOrgName`,
@@ -43,6 +45,7 @@
lrpd.fund AS yd_zjzyf,
lrpd.orgSidPath,
lrpd.createBySid,
+ bv.riskStaffUserSid,
bv.riskStaffUserName,
lr.createTime
FROM `loan_repayment_plan_details` lrpd
@@ -60,9 +63,6 @@
${ew.sqlSegment}
- GROUP BY a1.loanContractNo,
- a1.vinNo,
- a1.busVinSid
@@ -72,4 +72,62 @@
riskStaffUserName = #{userName}
WHERE sid = #{saleVehSid}
+
+
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java
index 4c172a1cdb..24afa6e3f4 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbeoverdueveh/LoanBeOverdueVehRest.java
@@ -1,5 +1,6 @@
package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh;
+import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehFegin;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
@@ -30,7 +31,14 @@ public class LoanBeOverdueVehRest implements LoanBeOverdueVehFegin {
}
@Override
- public ResultBean allocationRiskStaff(List saleVehSids, String userSid) {
- return loanBeOverdueVehService.allocationRiskStaff(saleVehSids, userSid);
+ public ResultBean> riskListPage(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = loanBeOverdueVehService.riskListPage(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ public ResultBean allocationRiskStaff(AllocationQuery allocationQuery) {
+ return loanBeOverdueVehService.allocationRiskStaff(allocationQuery);
}
}
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 63fe648df0..175dcd88fd 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
@@ -2,11 +2,11 @@ package com.yxt.anrui.riskcenter.biz.loanbeoverdueveh;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo;
-import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit;
+import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.AllocationQuery;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehQuery;
import com.yxt.anrui.riskcenter.api.loanbeoverdueveh.LoanBeOverdueVehVo;
import com.yxt.common.base.utils.PagerUtil;
@@ -49,18 +49,18 @@ public class LoanBeOverdueVehService {
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
- qw.like("al.orgSidPath", orgSidPath);
+ qw.like("a1.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
- qw.like("al.orgSidPath", orgSidPath);
+ qw.like("a1.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
- qw.like("al.orgSidPath", orgSidPath);
+ qw.like("a1.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
- qw.like("al.orgSidPath", orgSidPath);
+ qw.like("a1.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
- qw.eq("al.createBySid", query.getUserSid());
+ qw.eq("a1.createBySid", query.getUserSid());
} else {
PagerVo p = new PagerVo<>();
return p;
@@ -70,7 +70,7 @@ public class LoanBeOverdueVehService {
return p;
}
}
- if (query.getIsFP()){
+ if (query.getIsFP()) {
qw.isNull("a1.riskStaffUserName");
}
if (StringUtils.isNotBlank(query.getUseOrgName())) {
@@ -85,9 +85,6 @@ public class LoanBeOverdueVehService {
if (StringUtils.isNotBlank(query.getBorrowerName())) {
qw.like("a1.borrowerName", query.getBorrowerName());
}
- if (StringUtils.isNotBlank(query.getVinNo())) {
- qw.like("a1.vinNo", query.getVinNo());
- }
if (StringUtils.isNotBlank(query.getCarNum())) {
qw.like("", query.getCarNum());
}
@@ -105,14 +102,20 @@ public class LoanBeOverdueVehService {
qw.apply(StringUtils.isNotBlank(collectionStartDate), "date_format (a1.createTime,'%Y-%m-%d') >= date_format('" + collectionStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(collectionEndDate), "date_format (a1.createTime,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
);
+ qw.groupBy("a1.loanContractNo");
+ qw.groupBy("a1.vinNo");
+ qw.groupBy("a1.busVinSid");
+ if (StringUtils.isNotBlank(query.getVinNo())) {
+ qw.having("vinNo = {0}", query.getVinNo());
+ }
if (StringUtils.isNotBlank(query.getBeOverduePeriod())) {
qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod());
}
if (StringUtils.isNotBlank(query.getBeOverdueMoney())) {
- qw.like("beOverdueMoney = {0}", query.getBeOverdueMoney());
+ qw.having("beOverdueMoney = {0}", query.getBeOverdueMoney());
}
if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())) {
- qw.like("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod());
+ qw.having("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod());
}
IPage page = PagerUtil.queryToPage(pq);
IPage pagging = loanBeOverdueVehMapper.selectPageVo(page, qw);
@@ -120,12 +123,67 @@ public class LoanBeOverdueVehService {
return p;
}
- public ResultBean allocationRiskStaff(List saleVehSids, String userSid) {
+ public PagerVo riskListPage(PagerQuery pq) {
+ LoanBeOverdueVehQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("a1.riskStaffUserSid", query.getUserSid());
+ if (StringUtils.isNotBlank(query.getUseOrgName())) {
+ qw.like("a1.useOrgName", query.getUseOrgName());
+ }
+ if (StringUtils.isNotBlank(query.getDept())) {
+ qw.like("a1.dept", query.getDept());
+ }
+ if (StringUtils.isNotBlank(query.getLoanContractNo())) {
+ qw.like("a1.loanContractNo", query.getLoanContractNo());
+ }
+ if (StringUtils.isNotBlank(query.getBorrowerName())) {
+ qw.like("a1.borrowerName", query.getBorrowerName());
+ }
+ if (StringUtils.isNotBlank(query.getCarNum())) {
+ qw.like("", query.getCarNum());
+ }
+ if (StringUtils.isNotBlank(query.getBankName())) {
+ qw.like("a1.bankName", query.getBankName());
+ }
+ if (StringUtils.isNotBlank(query.getBankContractNo())) {
+ qw.like("a1.bankContractNo", query.getBankContractNo());
+ }
+ 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')").
+ apply(StringUtils.isNotBlank(collectionEndDate), "date_format (a1.createTime,'%Y-%m-%d') <= date_format('" + collectionEndDate + "','%Y-%m-%d')"
+ );
+ qw.groupBy("a1.loanContractNo");
+ qw.groupBy("a1.vinNo");
+ qw.groupBy("a1.busVinSid");
+ if (StringUtils.isNotBlank(query.getVinNo())) {
+ qw.having("vinNo = {0}", query.getVinNo());
+ }
+ if (StringUtils.isNotBlank(query.getBeOverduePeriod())) {
+ qw.having("beOverduePeriod = {0}", query.getBeOverduePeriod());
+ }
+ if (StringUtils.isNotBlank(query.getBeOverdueMoney())) {
+ qw.having("beOverdueMoney = {0}", query.getBeOverdueMoney());
+ }
+ if (StringUtils.isNotBlank(query.getBeOverdueMoneyAndPeriod())) {
+ qw.having("beOverdueMoneyAndPeriod = {0}", query.getBeOverdueMoneyAndPeriod());
+ }
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = loanBeOverdueVehMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean allocationRiskStaff(AllocationQuery allocationQuery) {
ResultBean rb = ResultBean.fireFail();
- SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
- for (String saleVehSid : saleVehSids) {
- loanBeOverdueVehMapper.allocationRiskStaff(saleVehSid,userSid,sysUserVo.getName());
+ SysUserVo sysUserVo = sysUserFeign.fetchBySid(allocationQuery.getUserSid()).getData();
+ for (String saleVehSid : allocationQuery.getSaleVehSids()) {
+ loanBeOverdueVehMapper.allocationRiskStaff(saleVehSid, allocationQuery.getUserSid(), sysUserVo.getName());
}
return rb.success();
}
+
+ public List initVehListByBorrSid(String borrowerSid) {
+ return loanBeOverdueVehMapper.initVehListByBorrSid(borrowerSid);
+ }
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
index 2c47b11df3..895ecf221a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitinvestigate/LoanHomevisitInvestigateMapper.java
@@ -90,4 +90,7 @@ public interface LoanHomevisitInvestigateMapper extends BaseMapper selPlanByNoAndPeriod(@Param("bankContractNo") String bankContractNo, @Param("period") String period);
String selBeMoney(@Param("no") String no,@Param("period") String period,@Param("bankContractNo") String bankContractNo);
+
+ MonRepayDetails details(String saleVehSid);
+
+ List periodDetails(String saleVehSid);
}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 9028d960a2..a1a87e6232 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -28,4 +28,71 @@
GROUP BY lrpd.`sid`
HAVING (yq_total > 0)
+
+
+
+
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java
index 0fa553aaac..c38309597b 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsRest.java
@@ -3,6 +3,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsFeign;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails;
import com.yxt.common.core.result.ResultBean;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,4 +34,11 @@ public class LoanRepaymentPlanDetailsRest implements LoanRepaymentPlanDetailsFei
public ResultBean deletePlanDetails(String scheduleSid) {
return loanRepaymentPlanDetailsService.deletePlanDetails(scheduleSid);
}
+
+ @Override
+ public ResultBean details(String saleVehSid) {
+ ResultBean rb = ResultBean.fireFail();
+ MonRepayDetails monRepayDetails = loanRepaymentPlanDetailsService.details(saleVehSid);
+ return rb.success().setData(monRepayDetails);
+ }
}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
index ccb1a701ba..59d432e1cf 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsService.java
@@ -22,6 +22,8 @@ import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistoryDto;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayDetails;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.MonRepayPeriodDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
@@ -92,4 +94,11 @@ public class LoanRepaymentPlanDetailsService extends MybatisBaseService monRepayPeriodDetailsList = baseMapper.periodDetails(saleVehSid);
+ monRepayDetails.setMonRepayPeriodDetailsList(monRepayPeriodDetailsList);
+ return monRepayDetails;
+ }
}
From a67fe2a26a4ebdd234890ba77576a3d9018ea4cf Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Dec 2023 16:50:43 +0800
Subject: [PATCH 13/15] =?UTF-8?q?=E5=82=AC=E6=94=B6=E6=9F=A5=E7=9C=8B?=
=?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=82=AC=E6=94=B6=E8=AE=B0=E5=BD=95=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../LoanBeCollectionRecordFeign.java | 2 +-
.../LoanBeCollectionRecordFeignFallback.java | 3 +-
.../LoanBeCollectionRecordHistoryVo.java | 70 +++++++++++++++++++
.../LoanBeCollectionRecordMapper.java | 3 +-
.../LoanBeCollectionRecordMapper.xml | 2 +-
.../LoanBeCollectionRecordRest.java | 6 +-
.../LoanBeCollectionRecordService.java | 6 +-
7 files changed, 83 insertions(+), 9 deletions(-)
create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVo.java
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeign.java
index a4b540024f..cae100642f 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeign.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeign.java
@@ -84,5 +84,5 @@ public interface LoanBeCollectionRecordFeign {
@ApiOperation("查看历史催收记录")
@GetMapping("/viewHistory")
@ResponseBody
- public ResultBean> viewHistory(@RequestParam("saleVehSid") String saleVehSid);
+ public ResultBean> viewHistory(@RequestParam("saleVehSid") String saleVehSid);
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeignFallback.java
index 60717961f6..48876bbd05 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeignFallback.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordFeignFallback.java
@@ -76,7 +76,8 @@ public class LoanBeCollectionRecordFeignFallback implements LoanBeCollectionReco
}
@Override
- public ResultBean> viewHistory(String saleVehSid) {
+ public ResultBean> viewHistory(String saleVehSid) {
return null;
}
+
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVo.java
new file mode 100644
index 0000000000..208419e859
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVo.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.riskcenter.api.loanbecollectionrecord;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-riskcenter(逾期催收记录)
+ * File: LoanBeCollectionRecordVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo
+ * Description: 逾期催收记录 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-12-11 13:45:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+public class LoanBeCollectionRecordHistoryVo implements Vo {
+
+ private String sid; // sid
+
+ @ApiModelProperty("催收日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 催收日期
+ @ApiModelProperty("催收方式value")
+ private String collectionTypeValue; // 催收方式value
+ @ApiModelProperty("定位具体位置")
+ private String locationStr; // 定位具体位置
+ @ApiModelProperty("催收结果value")
+ private String collectionResultValue; // 催收结果value
+ @ApiModelProperty("联系人value")
+ private String contactsValue; // 联系人value
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.java
index 7f65f0d096..4250ab8db5 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.java
@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordDetailsVo;
+import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordHistoryVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -64,5 +65,5 @@ public interface LoanBeCollectionRecordMapper extends BaseMapper selectListVo();
- List viewHistory(String saleVehSid);
+ List viewHistory(String saleVehSid);
}
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml
index 535f650372..b76df843ff 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordMapper.xml
@@ -19,7 +19,7 @@