From f0e8ddf5143242a8837ceaa382ccbb238047d791 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 19 Dec 2023 13:39:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=82=AC=E6=94=B6=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFundsCarriedForwardApplyService.java | 16 +- .../LoanBeCollectionApplyDetailsVo.java | 7 +- .../LoanBeCollectionApplyDto.java | 7 +- .../LoanBeCollectionFileVo.java | 55 ++++++ .../LoanBeCollectionRecordFeign.java | 2 +- .../LoanBeCollectionRecordFeignFallback.java | 3 +- .../LoanBeCollectionRecordHistoryVehVo.java | 36 ++++ .../LoanBeCollectionVehDbrDetailsVo.java | 76 +++++++ .../LoanBeCollectionVehDetailsVo.java | 4 + .../LoanBeCollectionVehDto.java | 6 + .../LoanBeCollectionVehFeign.java | 12 ++ .../LoanBeCollectionVehFeignFallback.java | 11 ++ .../riskcenter/api/loanfile/LoanFileEnum.java | 2 + .../LoanBeCollectionApplyService.java | 185 +++++++++++++----- .../LoanBeCollectionRecordMapper.java | 7 +- .../LoanBeCollectionRecordMapper.xml | 65 ++++++ .../LoanBeCollectionRecordRest.java | 6 +- .../LoanBeCollectionRecordService.java | 6 +- .../LoanBeCollectionVehRest.java | 18 +- .../LoanBeCollectionVehService.java | 19 +- 20 files changed, 461 insertions(+), 82 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionFileVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVehVo.java create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java index 77ab5ffe23..e3fe3bb8f8 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java @@ -546,6 +546,7 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService listOne, List removeList) { //4.对比一条的和多条的是否存在相同的客户编码,相同的结转金额相减，多条中相同客户编码的记录去除 String custNo = listOne.get(0).getCustNo(); - for (TzDto tzDto : removeList) { + Iterator iterator = removeList.iterator(); + while (iterator.hasNext()){ + TzDto tzDto = iterator.next(); if (tzDto.getCustNo().equals(custNo)) { if (tzDto.getTzType().equals("转入")) { listOne.get(0).setDcje(listOne.get(0).getDcje() - tzDto.getDrje()); } else { listOne.get(0).setDrje(listOne.get(0).getDrje() - tzDto.getDcje()); } - removeList.remove(tzDto); - } - if (removeList.size() == 0) { - return false; + iterator.remove(); } } return true; 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 index c56fc4d2a8..ec9d5409d6 100644 --- 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 @@ -35,6 +35,7 @@ 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; @@ -57,6 +58,8 @@ public class LoanBeCollectionApplyDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty(value = "备注") + private String remarks; @ApiModelProperty("申请日期") private String createTime; @ApiModelProperty("创建人sid") @@ -70,7 +73,7 @@ public class LoanBeCollectionApplyDetailsVo implements Vo { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("催收措施") - private List collMeasures; // 催收措施 + private List collMeasures = new ArrayList<>(); // 催收措施 @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") @@ -87,6 +90,8 @@ public class LoanBeCollectionApplyDetailsVo implements Vo { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id + @ApiModelProperty("附件") + private List files = new ArrayList<>(); @ApiModelProperty("逾期车辆列表") private List loanBeCollectionVehDetails; } \ 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 index b71193844e..71fd47435d 100644 --- 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 @@ -35,6 +35,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -56,6 +57,8 @@ public class LoanBeCollectionApplyDto implements Dto { private String sid; // sid + @ApiModelProperty(value = "备注") + private String remarks; @ApiModelProperty("申请日期") private String createTime; @ApiModelProperty("创建人sid") @@ -69,7 +72,7 @@ public class LoanBeCollectionApplyDto implements Dto { @ApiModelProperty("申请部门名称") private String deptName; // 申请部门名称 @ApiModelProperty("催收措施") - private List collMeasures; // 催收措施 + private List collMeasures = new ArrayList<>(); // 催收措施 @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid @ApiModelProperty("分公司名称") @@ -86,6 +89,8 @@ public class LoanBeCollectionApplyDto implements Dto { private String nodeState; // 流程状态 @ApiModelProperty("任务id") private String taskId; // 任务id + @ApiModelProperty("附件") + private List files = new ArrayList<>(); @ApiModelProperty("逾期车辆列表") private List loanBeCollectionVehDetails; } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionFileVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionFileVo.java new file mode 100644 index 0000000000..6948b48315 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionapply/LoanBeCollectionFileVo.java @@ -0,0 +1,55 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.riskcenter.api.loanbecollectionapply; + + +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.Date; + +/** + * 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 LoanBeCollectionFileVo implements Vo { + + private String url; +} 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 cae100642f..614a11933b 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 48876bbd05..ac29859515 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,8 +76,7 @@ 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/LoanBeCollectionRecordHistoryVehVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVehVo.java new file mode 100644 index 0000000000..c52c0bf7cc --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionrecord/LoanBeCollectionRecordHistoryVehVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.riskcenter.api.loanbecollectionrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class LoanBeCollectionRecordHistoryVehVo { + + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车牌号") + private String carNum; + @ApiModelProperty("贷款人") + private String borrowName; + @ApiModelProperty("贷款人联系电话") + private String borrowPhone; + @ApiModelProperty("客户名称") + private String custName; + @ApiModelProperty("资方") + private String bankName; + @ApiModelProperty("首次逾期日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date firstBeDate; + @ApiModelProperty("逾期期数") + private String beOverduePeriod; + @ApiModelProperty("逾期金额") + private String beOverdueMoney; + @ApiModelProperty("逾期金额换算期数") + private String beOverdueMoneyAndPeriod; + @ApiModelProperty + private List loanBeCollectionRecordHistoryVoList; +} diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java new file mode 100644 index 0000000000..358170bc4d --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDbrDetailsVo.java @@ -0,0 +1,76 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _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: LoanHomevisitInvestigateOtherpeoVo.java
+ * Class: com.yxt.anrui.riskcenter.api.loanhomevisitinvestigateotherpeo.LoanHomevisitInvestigateOtherpeoVo
+ * Description: 家访考察-其他人员 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-08-10 15:13:46
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "家访考察-其他人员 视图数据详情", description = "家访考察-其他人员 视图数据详情") +public class LoanBeCollectionVehDbrDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("人员身份key") + private String peoTypeKey; + @ApiModelProperty("人员身份") + private String peoType; // 人员身份 + @ApiModelProperty("姓名") + private String peoName; // 姓名 + @ApiModelProperty("身份证号") + private String idNumber; // 身份证号 + @ApiModelProperty("手机号") + private String mobile; // 手机号 + @ApiModelProperty("户籍地址") + private String peoDomAddress; // 户籍地址 + @ApiModelProperty("现住址") + private String peoPreAddress; // 现住址 + @ApiModelProperty("工作单位") + private String workUnit; // 工作单位 + @ApiModelProperty("职业key") + private String peoCareerKey; // 职业key + @ApiModelProperty("职业value") + private String peoCareerValue; // 职业value + @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/LoanBeCollectionVehDetailsVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanbecollectionveh/LoanBeCollectionVehDetailsVo.java index 021d748684..340e56e50b 100644 --- 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 @@ -27,12 +27,14 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; 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; import java.util.Map; @@ -86,6 +88,8 @@ public class LoanBeCollectionVehDetailsVo implements Vo { @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid + @ApiModelProperty + private List hkxyFiles = new ArrayList<>(); @ApiModelProperty private List sids; } \ 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 index b117485261..da2e1faf92 100644 --- 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 @@ -26,12 +26,16 @@ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionFileVo; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + /** * Project: anrui-riskcenter(催收措施申请)
* File: LoanBeCollectionVehDto.java
@@ -80,4 +84,6 @@ public class LoanBeCollectionVehDto implements Dto { @ApiModelProperty("催收申请sid") private String mainSid; // 催收申请sid + @ApiModelProperty + private List hkxyFiles = new ArrayList<>(); } \ 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 index cdfb88c1ca..545b952550 100644 --- 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 @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDetailsVo; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import com.yxt.common.core.query.PagerQuery; @@ -75,4 +77,14 @@ public interface LoanBeCollectionVehFeign { @GetMapping("/fetchDetailsBySid/{sid}") @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + + @ApiOperation("初始化担保人") + @GetMapping("/initDbr") + @ResponseBody + public ResultBean initDbr(@RequestParam("saleVehSid") String saleVehSid); + + @ApiOperation("增加担保人") + @PostMapping("/saveDbr") + @ResponseBody + public ResultBean saveDbr(@RequestBody LoanBeCollectionApplyDto dto); } \ 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 index 3d96c21f70..e4df01820c 100644 --- 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 @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.riskcenter.api.loanbecollectionveh; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +70,14 @@ public class LoanBeCollectionVehFeignFallback implements LoanBeCollectionVehFeig ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-riskcenter/loanbecollectionveh/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean initDbr(String saleVehSid) { + return null; + } + + @Override + public ResultBean saveDbr(LoanBeCollectionApplyDto dto) { + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java index 97b9a766da..10a9b3dd54 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfile/LoanFileEnum.java @@ -25,6 +25,8 @@ public enum LoanFileEnum { TRANSFERPAYMENT("016", "代收代付附件"), ACCRUALAPPLY("017", "月还计提附件"), BECOLLECTIONRECORD("018", "逾期催收附件"), + BECOLLECTIONAPPLY("019", "催收措施附件"), + BECOLLECTIONVEHHKXY("020", "催收措施车辆还款协议附件"), ; 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 index 754fe1b3e5..7ef0104f89 100644 --- 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 @@ -41,12 +41,15 @@ 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.loanbecollectionapply.*; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordDto; import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVehInit; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDetailsVo; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehDto; import com.yxt.anrui.riskcenter.api.loanbecollectionveh.LoanBeCollectionVehFile; import com.yxt.anrui.riskcenter.api.loanbepadsincereapply.LoanBePadsincereApplyVo; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; +import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigatecustomer.LoanHomevisitInvestigateCustomerDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.biz.loanbecollectionveh.LoanBeCollectionVehService; @@ -62,12 +65,6 @@ 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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -108,6 +105,10 @@ public class LoanBeCollectionApplyService extends MybatisBaseService createQueryWrapper(LoanBeCollectionApplyQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -183,19 +184,75 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanBeCollectionVehDetails = dto.getLoanBeCollectionVehDetails(); + List files = dto.getFiles(); if (StringUtils.isBlank(dtoSid)) { String sid = this.insertByDto(dto); + if (files != null && files.size() > 0){ + for (LoanBeCollectionFileVo file : files) { + LoanFile loanFile = new LoanFile(); + loanFile.setLinkSid(sid); + loanFile.setAttachType(LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); + String filePath = file.getUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanFile.setFilePath(filePath); + loanFileService.save(loanFile); + } + } for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) { loanBeCollectionVehDetail.setMainSid(sid); - loanBeCollectionVehService.saveOrUpdateDto(loanBeCollectionVehDetail); + String vehSid = loanBeCollectionVehService.saveOrUpdateDto(loanBeCollectionVehDetail); + List hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles(); + if (hkxyFiles != null && hkxyFiles.size() > 0){ + for (LoanBeCollectionFileVo hkxyFile : hkxyFiles) { + LoanFile loanFile = new LoanFile(); + loanFile.setLinkSid(vehSid); + loanFile.setAttachType(LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); + String filePath = hkxyFile.getUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanFile.setFilePath(filePath); + loanFileService.save(loanFile); + } + } } return; } this.updateByDto(dto); + loanFileService.delByLinkSidOrType(dtoSid,LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); + if (files != null && files.size() > 0){ + for (LoanBeCollectionFileVo file : files) { + LoanFile loanFile = new LoanFile(); + loanFile.setLinkSid(dtoSid); + loanFile.setAttachType(LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); + String filePath = file.getUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanFile.setFilePath(filePath); + loanFileService.save(loanFile); + } + } loanBeCollectionVehService.delByMainSid(dtoSid); for (LoanBeCollectionVehDto loanBeCollectionVehDetail : loanBeCollectionVehDetails) { loanBeCollectionVehDetail.setMainSid(dtoSid); - loanBeCollectionVehService.saveOrUpdateDto(loanBeCollectionVehDetail); + String sid = loanBeCollectionVehService.saveOrUpdateDto(loanBeCollectionVehDetail); + List hkxyFiles = loanBeCollectionVehDetail.getHkxyFiles(); + if (hkxyFiles != null && hkxyFiles.size() > 0){ + for (LoanBeCollectionFileVo hkxyFile : hkxyFiles) { + LoanFile loanFile = new LoanFile(); + loanFile.setLinkSid(sid); + loanFile.setAttachType(LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); + String filePath = hkxyFile.getUrl(); + if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); + } + loanFile.setFilePath(filePath); + loanFileService.save(loanFile); + } + } } } @@ -227,39 +284,70 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanFiles = loanFileService.selectByLinkSid(sid, LoanFileEnum.BECOLLECTIONAPPLY.getAttachType()); + List loanBeCollectionFileVos = new ArrayList<>(); + if (loanFiles != null && loanFiles.size() > 0){ + for (LoanFile loanFile : loanFiles) { + LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); + String filePath = loanFile.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanBeCollectionFileVo.setUrl(filePath); + loanBeCollectionFileVos.add(loanBeCollectionFileVo); + } + } + vo.setFiles(loanBeCollectionFileVos); List loanBeCollectionVehDetailsVos = loanBeCollectionVehService.selByMainSid(sid); for (LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo : loanBeCollectionVehDetailsVos) { + List loanFiles1 = loanFileService.selectByLinkSid(loanBeCollectionVehDetailsVo.getSid(), LoanFileEnum.BECOLLECTIONVEHHKXY.getAttachType()); + List loanBeCollectionFileVos1 = new ArrayList<>(); + if (loanFiles1 != null && loanFiles1.size() > 0){ + for (LoanFile file : loanFiles1) { + LoanBeCollectionFileVo loanBeCollectionFileVo = new LoanBeCollectionFileVo(); + String filePath = file.getFilePath(); + String urlPrefix = fileUploadComponent.getUrlPrefix(); + filePath = urlPrefix + filePath; + loanBeCollectionFileVo.setUrl(filePath); + loanBeCollectionFileVos1.add(loanBeCollectionFileVo); + } + } + loanBeCollectionVehDetailsVo.setHkxyFiles(loanBeCollectionFileVos1); List loanBeCollectionVehFiles = new ArrayList<>(); - LoanBeCollectionVehFile loanBeCollectionVehFile = new LoanBeCollectionVehFile(); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionVehDetailsVo.getSaleVehSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionVehDetailsVo.getSaleVehSid()).getData(); //催收记录sid - loanBeCollectionVehFile.setName("催收记录"); - loanBeCollectionVehFile.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile1.setName("催收记录"); + loanBeCollectionVehFile1.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile1); //开票管理sid FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData(); - loanBeCollectionVehFile.setName("开票信息"); - loanBeCollectionVehFile.setSid(finVehicleInvoice.getSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile2.setName("开票信息"); + loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile2); //月还明细sid - loanBeCollectionVehFile.setName("月还明细"); - loanBeCollectionVehFile.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile3.setName("月还明细"); + loanBeCollectionVehFile3.setSid(loanBeCollectionVehDetailsVo.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile3); //金融方案sid LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(busSalesOrder.getSid()); - loanBeCollectionVehFile.setName("金融方案"); - loanBeCollectionVehFile.setSid(loanSolutions.getSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile4.setName("金融方案"); + loanBeCollectionVehFile4.setSid(loanSolutions.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile4); //家访考察报告sid String jfkcSid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle1.getBorrowerSid()); - loanBeCollectionVehFile.setName("家访考察报告"); - loanBeCollectionVehFile.setSid(jfkcSid); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile5.setName("家访考察报告"); + loanBeCollectionVehFile5.setSid(jfkcSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile5); //家访考察资料sid - loanBeCollectionVehFile.setName("家访考察资料"); - loanBeCollectionVehFile.setSid(jfkcSid); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile6 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile6.setName("家访考察资料"); + loanBeCollectionVehFile6.setSid(jfkcSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile6); loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles); } vo.setLoanBeCollectionVehDetails(loanBeCollectionVehDetailsVos); @@ -280,38 +368,43 @@ public class LoanBeCollectionApplyService extends MybatisBaseService loanBeCollectionVehDetailsVos = new ArrayList<>(); for (LoanBeCollectionRecordVehInit loanBeCollectionRecordVehInit : loanBeCollectionRecordVehInits) { List loanBeCollectionVehFiles = new ArrayList<>(); - LoanBeCollectionVehFile loanBeCollectionVehFile = new LoanBeCollectionVehFile(); LoanBeCollectionVehDetailsVo loanBeCollectionVehDetailsVo = new LoanBeCollectionVehDetailsVo(); BeanUtil.copyProperties(loanBeCollectionRecordVehInit, loanBeCollectionVehDetailsVo); BusSalesOrder busSalesOrder = busSalesOrderFeign.fetchBySid(loanBeCollectionRecordVehInit.getSalesOrderSid()).getData(); BusSalesOrderVehicle busSalesOrderVehicle1 = busSalesOrderVehicleFeign.details(loanBeCollectionRecordVehInit.getSaleVehSid()).getData(); //催收记录sid - loanBeCollectionVehFile.setName("催收记录"); - loanBeCollectionVehFile.setSid(loanBeCollectionRecordVehInit.getSaleVehSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile1 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile1.setName("催收记录"); + loanBeCollectionVehFile1.setSid(loanBeCollectionRecordVehInit.getSaleVehSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile1); //开票管理sid FinVehicleInvoice finVehicleInvoice = finVehicleInvoiceFeign.selectByVinAndContractNo(busSalesOrderVehicle1.getLinkSid(), busSalesOrder.getContractNo()).getData(); - loanBeCollectionVehFile.setName("开票信息"); - loanBeCollectionVehFile.setSid(finVehicleInvoice.getSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile2 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile2.setName("开票信息"); + //loanBeCollectionVehFile2.setSid(finVehicleInvoice.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile2); //月还明细sid - loanBeCollectionVehFile.setName("月还明细"); - loanBeCollectionVehFile.setSid(saleVehSid); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile3 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile3.setName("月还明细"); + loanBeCollectionVehFile3.setSid(saleVehSid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile3); //金融方案sid LoanSolutions loanSolutions = loanSolutionsService.selectBySaleOrderSid(loanBeCollectionRecordVehInit.getSalesOrderSid()); - loanBeCollectionVehFile.setName("金融方案"); - loanBeCollectionVehFile.setSid(loanSolutions.getSid()); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile4 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile4.setName("金融方案"); + loanBeCollectionVehFile4.setSid(loanSolutions.getSid()); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile4); //家访考察报告sid String sid = loanHomevisitInvestigateService.selectByBorrSid(busSalesOrderVehicle.getBorrowerSid()); - loanBeCollectionVehFile.setName("家访考察报告"); - loanBeCollectionVehFile.setSid(sid); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile5 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile5.setName("家访考察报告"); + loanBeCollectionVehFile5.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile5); //家访考察资料sid - loanBeCollectionVehFile.setName("家访考察资料"); - loanBeCollectionVehFile.setSid(sid); - loanBeCollectionVehFiles.add(loanBeCollectionVehFile); + LoanBeCollectionVehFile loanBeCollectionVehFile6 = new LoanBeCollectionVehFile(); + loanBeCollectionVehFile6.setName("家访考察资料"); + loanBeCollectionVehFile6.setSid(sid); + loanBeCollectionVehFiles.add(loanBeCollectionVehFile6); loanBeCollectionVehDetailsVo.setSids(loanBeCollectionVehFiles); loanBeCollectionVehDetailsVo.setSaleVehSid(saleVehSid); loanBeCollectionVehDetailsVos.add(loanBeCollectionVehDetailsVo); 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 4250ab8db5..0b40582c5c 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 @@ -29,13 +29,10 @@ 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 com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordDetailsVo; -import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordHistoryVo; +import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; -import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecord; -import com.yxt.anrui.riskcenter.api.loanbecollectionrecord.LoanBeCollectionRecordVo; import java.util.List; @@ -66,4 +63,6 @@ public interface LoanBeCollectionRecordMapper extends BaseMapper selectListVo(); List viewHistory(String saleVehSid); + + LoanBeCollectionRecordHistoryVehVo viewHistoryVeh(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 b76df843ff..8761230871 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 @@ -30,4 +30,69 @@ FROM loan_be_collection_record WHERE saleVehSid = #{saleVehSid} + + \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java index f5a67584ca..cb348410c8 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbecollectionrecord/LoanBeCollectionRecordRest.java @@ -101,9 +101,9 @@ public class LoanBeCollectionRecordRest implements LoanBeCollectionRecordFeign { } @Override - public ResultBean> viewHistory(String saleVehSid) { + public ResultBean viewHistory(String saleVehSid) { ResultBean rb = ResultBean.fireFail(); - List loanBeCollectionRecordHistoryVoList = loanBeCollectionRecordService.viewHistory(saleVehSid); - return rb.success().setData(loanBeCollectionRecordHistoryVoList); + LoanBeCollectionRecordHistoryVehVo loanBeCollectionRecordHistoryVehVo = loanBeCollectionRecordService.viewHistory(saleVehSid); + return rb.success().setData(loanBeCollectionRecordHistoryVehVo); } } 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 ebc5c2d06d..203b765724 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 @@ -219,8 +219,10 @@ public class LoanBeCollectionRecordService extends MybatisBaseService viewHistory(String saleVehSid) { + public LoanBeCollectionRecordHistoryVehVo viewHistory(String saleVehSid) { + LoanBeCollectionRecordHistoryVehVo loanBeCollectionRecordHistoryVehVo = baseMapper.viewHistoryVeh(saleVehSid); List loanBeCollectionRecordDetailsVoList = baseMapper.viewHistory(saleVehSid); - return loanBeCollectionRecordDetailsVoList; + loanBeCollectionRecordHistoryVehVo.setLoanBeCollectionRecordHistoryVoList(loanBeCollectionRecordDetailsVoList); + return loanBeCollectionRecordHistoryVehVo; } } \ 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 index ec92590452..cc1d412a11 100644 --- 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 @@ -25,6 +25,8 @@ *********************************************************/ package com.yxt.anrui.riskcenter.biz.loanbecollectionveh; +import com.yxt.anrui.riskcenter.api.loanbecollectionapply.LoanBeCollectionApplyDto; +import 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; @@ -34,12 +36,6 @@ 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(催收措施申请)
@@ -97,4 +93,14 @@ public class LoanBeCollectionVehRest implements LoanBeCollectionVehFeign { LoanBeCollectionVehDetailsVo vo = loanBeCollectionVehService.fetchDetailsVoBySid(sid); return rb.success().setData(vo); } + + @Override + public ResultBean initDbr(String saleVehSid) { + return null; + } + + @Override + public ResultBean saveDbr(LoanBeCollectionApplyDto dto) { + return null; + } } 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 index 8c4fd5bba7..803c6219cc 100644 --- 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 @@ -76,33 +76,36 @@ public class LoanBeCollectionVehService extends MybatisBaseService Date: Tue, 19 Dec 2023 13:41:27 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=82=AC=E6=94=B6=E6=8E=AA=E6=96=BD?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml b/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml index a2b8908491..cf254c0438 100644 --- a/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml +++ b/anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml @@ -25,7 +25,7 @@ image: url: prefix: http://192.168.1.109:8111/upload/ kingdee: #金蝶的系统的链接账号 url等信息 - acctID: 65641dbcf39079 #登录金蝶的账户信息 202311测试 + acctID: 65641dbcf39079 #登录金蝶的账户信息 2023测试 userName: 信息部 #登录金蝶的账户信息 202311测试的 password: 123456 #登录金蝶的账户信息 userName_administrator: Administrator #登录金蝶的账户信息 202311测试 From 44c81da498ffcbd316da4df2d99777518246383b Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 19 Dec 2023 14:35:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=B4=A6=E5=8D=95?= =?UTF-8?q?=E6=98=8E=E7=BB=86=EF=BC=8C=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseVehicleStateFeign.java | 4 ++ .../BaseVehicleStateMapper.java | 5 +- .../BaseVehicleStateRest.java | 5 ++ .../BaseVehicleStateService.java | 6 ++ ...UncollectedReceivablesDetailedService.java | 61 +++++++++++-------- 5 files changed, 55 insertions(+), 26 deletions(-) diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java index 2ec98195ef..f0baab4c17 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclestate/BaseVehicleStateFeign.java @@ -53,4 +53,8 @@ public interface BaseVehicleStateFeign { ResultBean updateManageState(@RequestParam("busVinSid") String busSid); + @PostMapping("selectOneByBusSidAndOrderSid") + @ResponseBody + ResultBean selectOneByBusSidAndOrderSid(@RequestParam("busSid") String busSid,@RequestParam("orderSid") String orderSid); + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java index 1e247f9b73..d4732d88c4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateMapper.java @@ -25,11 +25,14 @@ public interface BaseVehicleStateMapper extends BaseMapper { BaseVehicleState selectOneQKKPByBusSid(String sid); BaseVehicleState selectByBusSid(String busSid); - List selectBusSidListByBusState(String busState); + List selectBusSidListByBusState(String busState); int updateBusStateByBusSid(@Param("busVinSid") String busVinSid, @Param("busState") String busState); int updateManageState(String busSid); + + @Select(" SELECT * FROM base_vehicle_state WHERE busSid = #{busSid} AND saleOrderSid = #{orderSid}") + BaseVehicleState selectOneByBusSidAndOrderSid(@Param("busSid") String busSid, @Param("orderSid") String orderSid); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java index e2cc52cbb3..0d012b7737 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateRest.java @@ -60,5 +60,10 @@ public class BaseVehicleStateRest implements BaseVehicleStateFeign { return baseVehicleStateService.updateManageState(busSid); } + @Override + public ResultBean selectOneByBusSidAndOrderSid(String busSid, String orderSid) { + return baseVehicleStateService.selectOneByBusSidAndOrderSid(busSid,orderSid); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java index 77b3dc2cd1..7a433460a8 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclestate/BaseVehicleStateService.java @@ -230,4 +230,10 @@ public class BaseVehicleStateService extends MybatisBaseService selectOneByBusSidAndOrderSid(String busSid, String orderSid) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleState baseVehicleState = baseMapper.selectOneByBusSidAndOrderSid(busSid,orderSid); + return rb.success().setData(baseVehicleState); + } } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java index 6dfab1fb7c..dee0dc2696 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.fin.biz.finuncollectedreceivablesdetailed; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleState; +import com.yxt.anrui.base.api.basevehiclestate.BaseVehicleStateFeign; import com.yxt.anrui.base.api.basevehicletempstate.BaseVehicleTempstateFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; @@ -124,7 +126,8 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService private FinCompanyInvoicingService finCompanyInvoicingService; @Autowired private FinVehicleInvoiceService finVehicleInvoiceService; - + @Autowired + private BaseVehicleStateFeign baseVehicleStateFeign; @Autowired private FinFundsCarriedForwardApplyService finFundsCarriedForwardApplyService; @@ -506,33 +509,41 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService if ((StringUtils.isNotBlank(svo.getBondAmounts()) && !("0.00").equals(svo.getBondAmounts())) || (StringUtils.isNotBlank(svo.getDepositPremium()) && !("0.00").equals(svo.getDepositPremium())) || (StringUtils.isNotBlank(svo.getDepositSettle()) && !("0.00").equals(svo.getDepositSettle()))) { - List sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo()); - List noSubscriptionMoneyList = new ArrayList<>(); - List noSubscriptionMoneyCheckList = new ArrayList<>(); - if (null != sidList) { - for (String s : sidList) { - FinUncollectedReceivablesDetailed detailed = fetchBySid(s); - List detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData(); - BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN); - for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) { - BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney(); - sumCheck = sumCheck.add(subscriptionMoney); + BaseVehicleState vehicleState = baseVehicleStateFeign.selectOneByBusSidAndOrderSid(record.getBusVinSid(),salesOrderSid).getData(); + if (null != vehicleState) { + if (StringUtils.isNotBlank(vehicleState.getFinState())) { + if (vehicleState.getFinState().equals("1")) { + record.setDownload(true); } - BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney()); - BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck); - noSubscriptionMoneyList.add(noSubscriptionMoneyCheck); - } - if (null != noSubscriptionMoneyList) { - for (BigDecimal money : noSubscriptionMoneyList) { - if (money.compareTo(BigDecimal.ZERO) > 0) { - noSubscriptionMoneyCheckList.add(1); - } - } - } - if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) { - record.setDownload(true); } } +// List sidList = baseMapper.selectSidBybusVinSidAndConNo(record.getBusVinSid(), record.getContractNo()); +// List noSubscriptionMoneyList = new ArrayList<>(); +// List noSubscriptionMoneyCheckList = new ArrayList<>(); +// if (null != sidList) { +// for (String s : sidList) { +// FinUncollectedReceivablesDetailed detailed = fetchBySid(s); +// List detaileds = finSelectedReceivablesDetailedService.fetchByReceivablesSid(s).getData(); +// BigDecimal sumCheck = new BigDecimal(0).setScale(2, RoundingMode.HALF_EVEN); +// for (FinSelectedReceivablesDetailed selectedReceivablesDetailed : detaileds) { +// BigDecimal subscriptionMoney = selectedReceivablesDetailed.getSubscriptionMoney(); +// sumCheck = sumCheck.add(subscriptionMoney); +// } +// BigDecimal reveivableMoneyCheck = new BigDecimal(detailed.getReveivableMoney()); +// BigDecimal noSubscriptionMoneyCheck = reveivableMoneyCheck.subtract(sumCheck); +// noSubscriptionMoneyList.add(noSubscriptionMoneyCheck); +// } +// if (null != noSubscriptionMoneyList) { +// for (BigDecimal money : noSubscriptionMoneyList) { +// if (money.compareTo(BigDecimal.ZERO) > 0) { +// noSubscriptionMoneyCheckList.add(1); +// } +// } +// } +// if (null == noSubscriptionMoneyCheckList || noSubscriptionMoneyCheckList.size() == 0 || noSubscriptionMoneyCheckList.isEmpty()) { +// record.setDownload(true); +// } +// } } } }