From 50201c851de4f0e0343c0b036df22301e3aade5c Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Wed, 12 Jul 2023 15:11:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=BB=93=E8=BD=AC=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinFileTypeEnum.java | 6 +- .../FinPreloanCreditApply.java | 15 ++- .../FinPreloanCreditApplyDetailsVo.java | 14 +++ .../FinPreloanCreditApplyDto.java | 6 + .../FinPreloanCreditApplyFeign.java | 10 ++ .../FinPreloanCreditApplyFeignFallback.java | 10 ++ .../FinSubmitCapitalRiskDto.java | 50 ++++++++ .../FinSubmitCompanyRiskDto.java | 107 ++++++++++++++++++ .../FinPreloanCreditApplyRest.java | 10 ++ .../FinSelectedReceivablesDetailedMapper.xml | 2 +- 10 files changed, 227 insertions(+), 3 deletions(-) create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java create mode 100644 anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java index 198bc88629..887c6e41a5 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinFileTypeEnum.java @@ -13,7 +13,11 @@ public class FinFileTypeEnum { ID_CARD("01", "身份证"), - COMPANY_RISK("02", "公司风控要求的文件"); + COMPANY_RISK("02", "公司风控要求的文件"), + + COMPANY_QUERYRES("03", "公司风控查询结果截图"), + + CAPITAL_QUERYRES("04", "资方风控查询结果截图"); private final String code; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java index 5a458e8030..105e7d9c74 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApply.java @@ -98,5 +98,18 @@ public class FinPreloanCreditApply extends BaseEntity { private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 - + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("资方审核日期") + private String zfshDate; + @ApiModelProperty("资方审核备注") + private String zfshRemarks; + @ApiModelProperty("申诉结果") + private String ssjg; } diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java index d3a4f24c9b..05436d6a4c 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDetailsVo.java @@ -104,6 +104,20 @@ public class FinPreloanCreditApplyDetailsVo implements Vo { private String taskId; // 任务id @ApiModelProperty("申请编号") private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("资方审核日期") + private String zfshDate; + @ApiModelProperty("资方审核备注") + private String zfshRemarks; + @ApiModelProperty("申诉结果") + private String ssjg; @ApiModelProperty("身份证正反面附件") private List idCardImages = new ArrayList<>(); @ApiModelProperty("贷前信用审核人员列表") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java index dbb0987a6c..6f057f9442 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyDto.java @@ -93,6 +93,12 @@ public class FinPreloanCreditApplyDto implements Dto { private String orgSidPath; // 组织全路径 @ApiModelProperty("申请编号") private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("申诉结果") + private String ssjg; @ApiModelProperty("身份证正反面附件") private List idCardImages = new ArrayList<>(); @ApiModelProperty("贷前信用审核人员列表") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java index 5f1c9ad424..6af30bc135 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeign.java @@ -65,6 +65,16 @@ public interface FinPreloanCreditApplyFeign { @PostMapping("/save") @ResponseBody public ResultBean save(@RequestBody FinPreloanCreditApplyDto dto); + + @ApiOperation("公司风控提交") + @PostMapping("/submitCompanyRisk") + @ResponseBody + public ResultBean submitCompanyRisk(@RequestBody FinPreloanCreditApplyDto dto); + + @ApiOperation("资方风控提交") + @PostMapping("/submitCapitalRisk") + @ResponseBody + public ResultBean submitCapitalRisk(@RequestBody FinPreloanCreditApplyDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delBySids") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java index 1c650e83e1..fc3e4a7136 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinPreloanCreditApplyFeignFallback.java @@ -59,6 +59,16 @@ public class FinPreloanCreditApplyFeignFallback implements FinPreloanCreditApply return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/save无法访问"); } + @Override + public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) { + return null; + } + + @Override + public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) { + return null; + } + @Override public ResultBean delBySids( String[] sids){ return ResultBean.fireFail().setMsg("接口anrui-fin/finpreloancreditapply/delBySids无法访问"); diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java new file mode 100644 index 0000000000..5113cc130d --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCapitalRiskDto.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpreloancreditapply; + +import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto; +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; + +@Data +public class FinSubmitCapitalRiskDto implements Dto { + + private String sid; + + @ApiModelProperty("公司审核结构") + private String gsshjg; + @ApiModelProperty("公司审核日期") + private String gsshDate; + @ApiModelProperty("公司审核备注") + private String gsshRemarks; + @ApiModelProperty("查询结果截图") + private List gsQueryResult = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java new file mode 100644 index 0000000000..7fa487474f --- /dev/null +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpreloancreditapply/FinSubmitCompanyRiskDto.java @@ -0,0 +1,107 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.fin.api.finpreloancreditapply; + + +import com.yxt.anrui.fin.api.finpreloancreditpeo.FinPreloanCreditPeoDto; +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-fin(贷前信用审核管理)
+ * File: FinPreloanCreditApplyDto.java
+ * Class: com.yxt.anrui.fin.api.finpreloancreditapply.FinPreloanCreditApplyDto
+ * Description: 贷前信用审核申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2023-07-11 11:04:28
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "贷前信用审核申请表 数据传输对象", description = "贷前信用审核申请表 数据传输对象") +public class FinSubmitCompanyRiskDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("创建人接口") + private String createByName; // 创建人接口 + @ApiModelProperty("申请部门sid") + private String applyDeptSid; // 申请部门sid + @ApiModelProperty("申请部门名称") + private String applyDeptName; // 申请部门名称 + @ApiModelProperty("车型sid") + private String modelSid; // 车型sid + @ApiModelProperty("车型名称") + private String modelName; // 车型名称 + @ApiModelProperty("客户类型key") + private String custTypeKey; // 客户类型key + @ApiModelProperty("客户类型value") + private String custTypeValue; // 客户类型value + @ApiModelProperty("企业sid") + private String qySid; // 企业sid + @ApiModelProperty("企业名称") + private String qyName; // 企业名称 + @ApiModelProperty("身份证号码") + private String idCard; // 身份证号码 + @ApiModelProperty("客户sid") + private String custSid; // 客户sid + @ApiModelProperty("客户名称") + private String custName; // 客户名称 + @ApiModelProperty("手机号码") + private String phone; // 手机号码 + @ApiModelProperty("资方sid") + private String capitalSid; // 资方sid + @ApiModelProperty("资方名称") + private String capitalName; // 资方名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("组织全路径") + private String orgSidPath; // 组织全路径 + @ApiModelProperty("申请编号") + private String billNo; // 申请编号 + @ApiModelProperty("公司风控结果") + private String gsfkjg; + @ApiModelProperty("资方风控结果") + private String zffkjg; + @ApiModelProperty("申诉结果") + private String ssjg; + @ApiModelProperty("身份证正反面附件") + private List idCardImages = new ArrayList<>(); + @ApiModelProperty("贷前信用审核人员列表") + private List finPreloanCreditPeos; + @ApiModelProperty("公司风控要求的文件") + private List comFkFiles = new ArrayList<>(); +} \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java index d58db6df63..3f557dd600 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpreloancreditapply/FinPreloanCreditApplyRest.java @@ -78,6 +78,16 @@ public class FinPreloanCreditApplyRest implements FinPreloanCreditApplyFeign { return finPreloanCreditApplyService.saveOrUpdateDto(dto); } + @Override + public ResultBean submitCompanyRisk(FinPreloanCreditApplyDto dto) { + return null; + } + + @Override + public ResultBean submitCapitalRisk(FinPreloanCreditApplyDto dto) { + return null; + } + @Override @ApiOperation("根据sid批量删除") @PostMapping("/delBySids") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml index e2fb6b9d74..c269756c1c 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml @@ -345,7 +345,7 @@ LEFT JOIN fin_collection_confirmation fcc ON ferd.`collSid` = fcc.`sid` LEFT JOIN anrui_base.`base_vehicle` bv - ON ferd.`VIN` = bv.`vinNo` AND fcc.`useOrgSid` = bv.`createOrgSid` + ON ferd.`VIN` LIKE ('%*'+bv.vinNo+'*%') AND fcc.`useOrgSid` = bv.`createOrgSid` ${ew.sqlSegment}