From 407ea17421e07b0722431610e229af6be05b1a03 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 27 Jul 2023 15:20:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanPreloanCreditApplyService.java | 23 +- .../CreditReviewDetailsOffVo.java | 38 +++ .../risk/creditreview/CreditReviewFeign.java | 30 +- .../CreditReviewFeignFallback.java | 18 +- .../risk/creditreview/CreditReviewOffDto.java | 2 +- .../risk/creditreview/CreditReviewRest.java | 26 +- .../creditreview/CreditReviewService.java | 286 +++++++++++++++--- 7 files changed, 351 insertions(+), 72 deletions(-) create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java index d12bef5713..14cc2a901e 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java @@ -217,7 +217,15 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; @@ -380,6 +400,7 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService idCardImages1 = loanPreloanCreditPeo.getIdCardImages(); for (String s : idCardImages1) { CommonAppendixDto commonAppendixDto = new CommonAppendixDto(); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java new file mode 100644 index 0000000000..0bd47e2a23 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsOffVo.java @@ -0,0 +1,38 @@ +package com.yxt.anrui.terminal.api.risk.creditreview; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +public class CreditReviewDetailsOffVo extends CreditReviewDetailsVo{ + + @ApiModelProperty("查询结果截图（公司）") + private List searchResultImages; + @ApiModelProperty("审核结果key（公司）") + private String examineResultKey; + @ApiModelProperty("审核结果（公司）") + private String examineResult; + @ApiModelProperty("审核日期（公司）") + private String examineDate; + @ApiModelProperty("审核备注（公司）") + private String examineRemarks; + @ApiModelProperty("资方剩余额度") + private String manageLeave; + @ApiModelProperty("查询结果截图（资方）") + private List searchResultImages2; + @ApiModelProperty("审核结果key（资方）") + private String examineResultKey2; + @ApiModelProperty("审核结果key（资方）") + private String examineResult2; + @ApiModelProperty("审核日期（资方）") + private String examineDate2; + @ApiModelProperty("审核备注（资方）") + private String examineRemarks2; + @ApiModelProperty("公司风控结果") + private List companyResultDict = new ArrayList<>(); + @ApiModelProperty("资方风控结果") + private List managementResultDict = new ArrayList<>(); +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java index 3f052da630..a4f8a93c2a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java @@ -29,16 +29,21 @@ import java.util.List; fallback = CreditReviewFeignFallback.class) public interface CreditReviewFeign { - @ApiOperation("获取贷前信用审核列表") - @PostMapping("/getCreditReviewList") - @ResponseBody - public ResultBean> getCreditReviewList(@RequestBody PagerQuery pagerQuery); - - @ApiOperation("获取贷前信用审核 个人/企业") + @ApiOperation("初始化贷前信用审核") @GetMapping("/initCreditReviewInfo") @ResponseBody public ResultBean initCreditReviewInfo(@SpringQueryMap CreditReviewDetailsQuery query); + @ApiOperation("初始化金融内勤审核") + @GetMapping("/initCreditReviewInfo2") + @ResponseBody + public ResultBean initCreditReviewInfo2(@SpringQueryMap CreditReviewDetailsQuery query); + + @ApiOperation("详情") + @GetMapping("/getCreditReviewInfo") + @ResponseBody + public ResultBean getCreditReviewInfo(@RequestParam("sid") String sid); + @ApiOperation("查询车型信息") @GetMapping("/selModelByUseOrgSid") @ResponseBody @@ -49,7 +54,7 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean> getTRCList(@SpringQueryMap CreditReviewDetailsQuery query); - @ApiOperation("保存贷前信用审核申请") + @ApiOperation("保存贷前信用审核") @PostMapping("/saveCreditReviewInfo") @ResponseBody public ResultBean saveCreditReviewInfo(@RequestBody CreditReviewDto dto); @@ -59,8 +64,13 @@ public interface CreditReviewFeign { @ResponseBody public ResultBean submitCreditReviewInfo(@RequestBody CreditReviewDto dto); - @ApiOperation("保存贷前信用审核申请1") - @PostMapping("/saveCreditReviewInfo1") + @ApiOperation("保存金融内勤审核") + @PostMapping("/saveCreditReviewInfo2") + @ResponseBody + public ResultBean saveCreditReviewInfo2(@RequestBody CreditReviewOffDto dto); + + @ApiOperation("提交金融内勤审核") + @PostMapping("/submitCreditReviewInfo2") @ResponseBody - public ResultBean saveCreditReviewInfo1(@RequestBody CreditReviewOffDto dto); + public ResultBean submitCreditReviewInfo2(@RequestBody CreditReviewOffDto dto); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java index 242d9782b6..db8b741c32 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java @@ -19,14 +19,18 @@ import java.util.List; @Component public class CreditReviewFeignFallback implements CreditReviewFeign { + @Override + public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + return null; + } @Override - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { return null; } @Override - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + public ResultBean getCreditReviewInfo(String sid) { return null; } @@ -46,12 +50,18 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { } @Override - public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { return null; } @Override - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { return null; } + + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return null; + } + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java index 2ea4c4fff6..aec286395a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewOffDto.java @@ -25,7 +25,7 @@ public class CreditReviewOffDto extends CreditReviewDto{ @ApiModelProperty("查询结果截图（资方）") private List searchResultImages2 = new ArrayList<>(); @ApiModelProperty("审核结果key（资方）") - private String examineResult2Key; + private String examineResultKey2; @ApiModelProperty("审核结果（资方）") private String examineResult2; @ApiModelProperty("审核日期（资方）") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java index 058d272210..80ced5e45b 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java @@ -30,13 +30,18 @@ public class CreditReviewRest implements CreditReviewFeign { private CreditReviewService creditReviewService; @Override - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { - return creditReviewService.getCreditReviewList(pagerQuery); + public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { + return creditReviewService.initCreditReviewInfo(query); } @Override - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { - return creditReviewService.initCreditReviewInfo(query); + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { + return creditReviewService.initCreditReviewInfo2(query); + } + + @Override + public ResultBean getCreditReviewInfo(String sid) { + return creditReviewService.getCreditReviewInfo(sid); } @Override @@ -55,12 +60,17 @@ public class CreditReviewRest implements CreditReviewFeign { } @Override - public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { - return creditReviewService.submitCreditReviewInfo(dto); + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { + return creditReviewService.saveCreditReviewInfo2(dto); } @Override - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { - return null; + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { + return creditReviewService.submitCreditReviewInfo2(dto); + } + + @Override + public ResultBean submitCreditReviewInfo(CreditReviewDto dto) { + return creditReviewService.submitCreditReviewInfo(dto); } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java index 3c1f56c646..b02715612f 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java @@ -63,47 +63,11 @@ public class CreditReviewService { @Autowired private LoanFinBankFeign loanFinBankFeign; - public ResultBean> getCreditReviewList(PagerQuery pagerQuery) { - ResultBean> rb = ResultBean.fireFail(); - PagerQuery pq = new PagerQuery<>(); - CreditReviewQuery params = pagerQuery.getParams(); - LoanPreloanCreditApplyQuery loanParams = new LoanPreloanCreditApplyQuery(); - loanParams.setOrgSidPath(params.getOrgPath()); - loanParams.setUserSid(params.getUserSid()); - loanParams.setType(params.getType()); - loanParams.setMenuSid(params.getMenuSid()); - loanParams.setName(params.getNames()); - pq.setParams(loanParams); - PagerVo loanPreloanCreditApplyVoPagerVo = loanPreloanCreditApplyFeign.listPage(pq).getData(); - PagerVo v = new PagerVo<>(); - List creditReviewVos = new ArrayList<>(); - for (LoanPreloanCreditApplyVo record : loanPreloanCreditApplyVoPagerVo.getRecords()) { - CreditReviewVo creditReviewVo = new CreditReviewVo(); - creditReviewVo.setSid(record.getSid()); - creditReviewVo.setCreateDate(DateUtil.formatDate(record.getCreateTime())); - creditReviewVo.setName(record.getKhqyName()); - creditReviewVo.setMobile(record.getPhone()); - creditReviewVo.setModel(record.getModelName()); - creditReviewVo.setManagement(record.getCapitalName()); - creditReviewVo.setExamineDate(record.getGsshDate()); - creditReviewVo.setCompanyResults(record.getGsfkjg()); - creditReviewVo.setManagementResults(record.getZffkjg()); - creditReviewVo.setShowDeleteBtn(record.getIsDelete()); - creditReviewVo.setShowUpdateBtn(record.getIsEdit()); - creditReviewVo.setShowHandleBtn(record.getIsHandle()); - creditReviewVo.setCustomerKey(record.getCustTypeKey()); - creditReviewVo.setAppealResults(record.getSsjg()); - creditReviewVos.add(creditReviewVo); - } - v.setRecords(creditReviewVos); - return rb.success().setData(v); - } - public ResultBean initCreditReviewInfo(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); CreditReviewDetailsVo creditReviewDetailsVo = new CreditReviewDetailsVo(); - if (StringUtils.isBlank(query.getSid())){//新增初始化 - if (query.getCreateSource() == 0){ + if (StringUtils.isBlank(query.getSid())) {//新增初始化 + if (query.getCreateSource() == 0) { SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); creditReviewDetailsVo.setUserSid(query.getUserSid()); @@ -112,12 +76,12 @@ public class CreditReviewService { creditReviewDetailsVo.setCreateTime(DateUtil.formatDate(new Date())); creditReviewDetailsVo.setCustomerTypeKey(query.getCustomerTypeKey()); creditReviewDetailsVo.setCustomerType(query.getCustomerTypeValue()); - }else if (query.getCreateSource() == 1){//意向车型发起 + } else if (query.getCreateSource() == 1) {//意向车型发起 - }else if (query.getCreateSource() == 2){//销售订单发起 + } else if (query.getCreateSource() == 2) {//销售订单发起 } - }else {//修改回显 + } else {//修改回显 LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); creditReviewDetailsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); creditReviewDetailsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); @@ -159,13 +123,13 @@ public class CreditReviewService { } //构建人员类型下拉选数据 List identityDetailsVos = new ArrayList<>(); - if ("1".equals(query.getCustomerTypeKey())){ + if ("1".equals(query.getCustomerTypeKey())) { IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("003"); identityDetailsVo.setDictKey("003"); identityDetailsVo.setDictValue("担保人"); identityDetailsVos.add(identityDetailsVo); - }else { + } else { IdentityDetailsVo identityDetailsVo = new IdentityDetailsVo(); identityDetailsVo.setSid("001"); identityDetailsVo.setDictKey("001"); @@ -186,6 +150,102 @@ public class CreditReviewService { return rb.success().setData(creditReviewDetailsVo); } + public ResultBean initCreditReviewInfo2(CreditReviewDetailsQuery query) { + ResultBean rb = ResultBean.fireFail(); + CreditReviewDetailsOffVo creditReviewDetailsoffVo = new CreditReviewDetailsOffVo(); + if (StringUtils.isBlank(query.getSid())) {//新增初始化 + if (query.getCreateSource() == 0) { + SysUserVo sysUserVo = sysUserFeign.fetchBySid(query.getUserSid()).getData(); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(query.getOrgPath()).getData(); + creditReviewDetailsoffVo.setUserSid(query.getUserSid()); + creditReviewDetailsoffVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsoffVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName()); + creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(new Date())); + creditReviewDetailsoffVo.setCustomerTypeKey(query.getCustomerTypeKey()); + creditReviewDetailsoffVo.setCustomerType(query.getCustomerTypeValue()); + } else if (query.getCreateSource() == 1) {//意向车型发起 + + } else if (query.getCreateSource() == 2) {//销售订单发起 + + } + } else {//修改回显 + LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + creditReviewDetailsoffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsoffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsoffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsoffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsoffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsoffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsoffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsoffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsoffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsoffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsoffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsoffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsoffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsoffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsoffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsoffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsoffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsoffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsoffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); + //creditReviewDetailsoffVo.setDownUrl(); + //参数优化 + query.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + //风控要求的其他人员 + List shareholderDetailsVos = new ArrayList<>(); + List loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos(); + for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName()); + shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone()); + shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard()); + shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks()); + shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey()); + shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue()); + shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsoffVo.setShareholderList(shareholderDetailsVos); + //公司风控 + creditReviewDetailsoffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsoffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsoffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsoffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsoffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + //资方风控 + creditReviewDetailsoffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsoffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsoffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsoffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsoffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsoffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + } + //构建人员类型下拉选数据 + List companyResultDict = new ArrayList<>(); + List managementResultDict = new ArrayList<>(); + IdentityDetailsVo identityDetailsVo1 = new IdentityDetailsVo(); + identityDetailsVo1.setSid("001"); + identityDetailsVo1.setDictKey("001"); + identityDetailsVo1.setDictValue("通过"); + companyResultDict.add(identityDetailsVo1); + managementResultDict.add(identityDetailsVo1); + IdentityDetailsVo identityDetailsVo2 = new IdentityDetailsVo(); + identityDetailsVo2.setSid("002"); + identityDetailsVo2.setDictKey("002"); + identityDetailsVo2.setDictValue("不通过"); + companyResultDict.add(identityDetailsVo2); + managementResultDict.add(identityDetailsVo2); + IdentityDetailsVo identityDetailsVo3 = new IdentityDetailsVo(); + identityDetailsVo3.setSid("003"); + identityDetailsVo3.setDictKey("003"); + identityDetailsVo3.setDictValue("暂无法判定"); + managementResultDict.add(identityDetailsVo3); + creditReviewDetailsoffVo.setCompanyResultDict(companyResultDict); + creditReviewDetailsoffVo.setManagementResultDict(managementResultDict); + return rb.success().setData(creditReviewDetailsoffVo); + } + public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); @@ -309,7 +369,7 @@ public class CreditReviewService { return rb.success(); } - public ResultBean saveCreditReviewInfo1(CreditReviewOffDto dto) { + public ResultBean saveCreditReviewInfo2(CreditReviewOffDto dto) { ResultBean rb = ResultBean.fireFail(); LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); loanPreloanCreditApplyDto.setSid(dto.getSid()); @@ -336,18 +396,148 @@ public class CreditReviewService { loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid); loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); - loanPreloanCreditApplyDto.setGsfkjgKey(""); + loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages()); + List shareholderList = dto.getShareholderList(); + List loanPreloanCreditPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) { + LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto(); + loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey()); + loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue()); + loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName()); + loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages()); + loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); + } + loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); + loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey()); loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult()); loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate()); loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks()); loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages()); - loanPreloanCreditApplyDto.setZffkjgKey(""); + loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave()); + loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2()); loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2()); + loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2()); loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2()); loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2()); - //loanPreloanCreditApplyFeign.save() - return null; + loanPreloanCreditApplyFeign.save(loanPreloanCreditApplyDto); + return rb.success(); + } + + + public ResultBean getCreditReviewInfo(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(sid).getData(); + CreditReviewDetailsOffVo creditReviewDetailsOffVo = new CreditReviewDetailsOffVo(); + creditReviewDetailsOffVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsOffVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsOffVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsOffVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsOffVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsOffVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsOffVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsOffVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsOffVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsOffVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsOffVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsOffVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsOffVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsOffVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsOffVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsOffVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsOffVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsOffVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsOffVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); + //风控要求的其他人员 + List shareholderDetailsVos = new ArrayList<>(); + List loanPreloanCreditPeos = loanPreloanCreditApplyDetailsVo.getLoanPreloanCreditPeos(); + for (LoanPreloanCreditPeoDetailsVo loanPreloanCreditPeo : loanPreloanCreditPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanPreloanCreditPeo.getPeoName()); + shareholderDetailsVo.setShareholderMobile(loanPreloanCreditPeo.getPhone()); + shareholderDetailsVo.setShareholderIdNumber(loanPreloanCreditPeo.getIdCard()); + shareholderDetailsVo.setShareholderRemarks(loanPreloanCreditPeo.getRemarks()); + shareholderDetailsVo.setShareholderTypeKey(loanPreloanCreditPeo.getPeoTypeKey()); + shareholderDetailsVo.setShareholderTypeValue(loanPreloanCreditPeo.getPeoTypeValue()); + shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsOffVo.setShareholderList(shareholderDetailsVos); + //公司风控 + creditReviewDetailsOffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsOffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsOffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsOffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsOffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + //资方风控 + creditReviewDetailsOffVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsOffVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsOffVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsOffVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsOffVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsOffVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + return rb.success().setData(creditReviewDetailsOffVo); } + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { + ResultBean rb = ResultBean.fireFail(); + LoanPreloanCreditApplyDto loanPreloanCreditApplyDto = new LoanPreloanCreditApplyDto(); + loanPreloanCreditApplyDto.setSid(dto.getSid()); + loanPreloanCreditApplyDto.setCreateBySid(dto.getUserSid()); + String[] publishInfos = dto.getPublishInfo().split("-"); + loanPreloanCreditApplyDto.setApplyDeptName(publishInfos[0]); + loanPreloanCreditApplyDto.setCreateByName(publishInfos[1]); + SysOrganizationVo sysOrganizationVoBM = sysOrganizationFeign.selectByOrgSidPath(dto.getOrgPath()).getData(); + loanPreloanCreditApplyDto.setApplyDeptSid(sysOrganizationVoBM.getSid()); + loanPreloanCreditApplyDto.setModelSid(dto.getModelSid()); + loanPreloanCreditApplyDto.setModelName(dto.getModel()); + loanPreloanCreditApplyDto.setCustTypeKey(dto.getCustomerTypeKey()); + loanPreloanCreditApplyDto.setCustTypeValue(dto.getCustomerType()); + loanPreloanCreditApplyDto.setQySid(dto.getCompanySid()); + loanPreloanCreditApplyDto.setQyName(dto.getCompanyName()); + loanPreloanCreditApplyDto.setIdCard(dto.getLegalPersonIdNumber()); + loanPreloanCreditApplyDto.setCustSid(dto.getLegalPersonSid()); + loanPreloanCreditApplyDto.setCustName(dto.getLegalPersonName()); + loanPreloanCreditApplyDto.setPhone(dto.getLegalPersonMobile()); + loanPreloanCreditApplyDto.setCapitalSid(dto.getManagementSid()); + loanPreloanCreditApplyDto.setCapitalName(dto.getManagementName()); + String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath()).getData(); + SysOrganizationVo sysOrganizationVoGS = sysOrganizationFeign.fetchBySid(useOrgSid).getData(); + loanPreloanCreditApplyDto.setUseOrgSid(useOrgSid); + loanPreloanCreditApplyDto.setUseOrgName(sysOrganizationVoGS.getName()); + loanPreloanCreditApplyDto.setOrgSidPath(dto.getOrgPath()); + loanPreloanCreditApplyDto.setIdCardImages(dto.getLegalPersonIdCardImages()); + List shareholderList = dto.getShareholderList(); + List loanPreloanCreditPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : shareholderList) { + LoanPreloanCreditPeoDto loanPreloanCreditPeoDto = new LoanPreloanCreditPeoDto(); + loanPreloanCreditPeoDto.setPeoTypeKey(shareholderDetailsVo.getShareholderTypeKey()); + loanPreloanCreditPeoDto.setPeoTypeValue(shareholderDetailsVo.getShareholderTypeValue()); + loanPreloanCreditPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanPreloanCreditPeoDto.setPeoName(shareholderDetailsVo.getShareholderName()); + loanPreloanCreditPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanPreloanCreditPeoDto.setIdCardImages(shareholderDetailsVo.getShareholderIdCardImages()); + loanPreloanCreditPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanPreloanCreditPeoDtos.add(loanPreloanCreditPeoDto); + } + loanPreloanCreditApplyDto.setLoanPreloanCreditPeos(loanPreloanCreditPeoDtos); + loanPreloanCreditApplyDto.setComFkFiles(dto.getMaterialImages()); + loanPreloanCreditApplyDto.setGsfkjgKey(dto.getExamineResultKey()); + loanPreloanCreditApplyDto.setGsfkjg(dto.getExamineResult()); + loanPreloanCreditApplyDto.setGsshDate(dto.getExamineDate()); + loanPreloanCreditApplyDto.setGsshRemarks(dto.getExamineRemarks()); + loanPreloanCreditApplyDto.setGsQueryResults(dto.getSearchResultImages()); + loanPreloanCreditApplyDto.setCapitalBalance(dto.getManageLeave()); + loanPreloanCreditApplyDto.setZffkjgKey(dto.getExamineResultKey2()); + loanPreloanCreditApplyDto.setZffkjg(dto.getExamineResult2()); + loanPreloanCreditApplyDto.setZfshDate(dto.getExamineDate2()); + loanPreloanCreditApplyDto.setZfshRemarks(dto.getExamineRemarks2()); + loanPreloanCreditApplyDto.setZfQueryResults(dto.getSearchResultImages2()); + loanPreloanCreditApplyFeign.finStaffConfirm(loanPreloanCreditApplyDto); + return rb.success(); + } }