diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 2205ef2cee..518d56aba7 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -119,13 +119,7 @@ bvcf.carModel, bvm.modelName AS modelNameQuan, bvm.`brandName` AS vehModelBrandName, - (SELECT - bbc.guidedPrice - FROM - base_vehmodel_config bbc - WHERE bbc.modelSid = bv.modelSid - AND bbc.useOrgSid = bv.useOrgSid - AND bmc.sid = bbc.configurationItemsSid) AS guidedPrice + bvc.guidedPrice FROM base_vehicle bv LEFT JOIN base_vehicle_model bvm @@ -136,6 +130,10 @@ ON bv.`sid` = bvcf.`vehicleSid` LEFT JOIN base_vehmodel_config bvc ON bvm.`sid` = bvc.`modelSid` + LEFT JOIN base_vehmodel_config bvc + ON bvc.modelSid = bv.modelSid + AND bvc.useOrgSid = bv.useOrgSid + AND bvc.configurationItemsSid=bv.`modelConfigSid` ${ew.sqlSegment} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsSsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsSsVo.java new file mode 100644 index 0000000000..4d715d5108 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsSsVo.java @@ -0,0 +1,18 @@ +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 CreditReviewDetailsSsVo extends CreditReviewDetailsOffVo{ + + @ApiModelProperty("申诉原因") + private String reason; + @ApiModelProperty("申诉其他人员") + private List guarantorList; + @ApiModelProperty("资产附件") + private List uploadFiles; +} 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 d1306bcf01..7b29bb6787 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 @@ -42,13 +42,18 @@ public interface CreditReviewFeign { @ApiOperation("申诉初始化") @GetMapping("/initCreditReviewInfo3") @ResponseBody - public ResultBean initCreditReviewInfo3(@SpringQueryMap CreditReviewDetailsQuery query); + public ResultBean initCreditReviewInfo3(@SpringQueryMap CreditReviewDetailsQuery query); @ApiOperation("详情") @GetMapping("/getCreditReviewInfo") @ResponseBody public ResultBean getCreditReviewInfo(@RequestParam("sid") String sid); + @ApiOperation("申诉详情") + @GetMapping("/getCreditReviewInfo2") + @ResponseBody + public ResultBean getCreditReviewInfo2(@RequestParam("sid") String sid); + @ApiOperation("查询车型信息") @GetMapping("/selModelByUseOrgSid") @ResponseBody @@ -78,4 +83,9 @@ public interface CreditReviewFeign { @PostMapping("/submitCreditReviewInfo2") @ResponseBody public ResultBean submitCreditReviewInfo2(@RequestBody CreditReviewOffDto dto); + + @ApiOperation("保存申诉申请") + @PostMapping("/saveCreditReviewInfo3") + @ResponseBody + public ResultBean saveCreditReviewInfo3(@RequestBody CreditReviewSsDto 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 cc134d1b6b..99e3ed9b4c 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 @@ -30,7 +30,7 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { } @Override - public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { + public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { return null; } @@ -39,6 +39,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean getCreditReviewInfo2(String sid) { + return null; + } + @Override public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { return null; @@ -64,6 +69,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean saveCreditReviewInfo3(CreditReviewSsDto 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/CreditReviewSsDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java new file mode 100644 index 0000000000..e97c524d20 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewSsDto.java @@ -0,0 +1,18 @@ +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 CreditReviewSsDto extends CreditReviewOffDto{ + + @ApiModelProperty("申诉原因") + private String reason; + @ApiModelProperty("申诉其他人员") + private List guarantorList; + @ApiModelProperty("资产附件") + private List uploadFiles; +} 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 4826ea570a..5b7a8f5aa0 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 @@ -40,7 +40,7 @@ public class CreditReviewRest implements CreditReviewFeign { } @Override - public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { + public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { return creditReviewService.initCreditReviewInfo3(query); } @@ -49,6 +49,11 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.getCreditReviewInfo(sid); } + @Override + public ResultBean getCreditReviewInfo2(String sid) { + return creditReviewService.getCreditReviewInfo2(sid); + } + @Override public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { return creditReviewService.selModelByUseOrgSid(query); @@ -74,6 +79,11 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.submitCreditReviewInfo2(dto); } + @Override + public ResultBean saveCreditReviewInfo3(CreditReviewSsDto dto) { + return creditReviewService.saveCreditReviewInfo3(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 dcf4c04087..bfe6d27d53 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 @@ -13,7 +13,10 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDetailsVo; +import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyDto; import com.yxt.anrui.riskcenter.api.loancreditappealapply.LoanCreditAppealApplyFeign; +import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDetailsVo; +import com.yxt.anrui.riskcenter.api.loancreditappealpeo.LoanCreditAppealPeoDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo; @@ -250,19 +253,19 @@ public class CreditReviewService { return rb.success().setData(creditReviewDetailsoffVo); } - public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { + public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); - CreditReviewDetailsOffVo creditReviewDetailsoffVo = new CreditReviewDetailsOffVo(); + CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo(); 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()); + creditReviewDetailsSsVo.setUserSid(query.getUserSid()); + creditReviewDetailsSsVo.setOrgPath(query.getOrgPath()); + creditReviewDetailsSsVo.setPublishInfo(sysOrganizationVoBM.getName() + "-" + sysUserVo.getName()); + creditReviewDetailsSsVo.setCreateTime(DateUtil.formatDate(new Date())); + creditReviewDetailsSsVo.setCustomerTypeKey(query.getCustomerTypeKey()); + creditReviewDetailsSsVo.setCustomerType(query.getCustomerTypeValue()); } else if (query.getCreateSource() == 1) {//意向车型发起 } else if (query.getCreateSource() == 2) {//销售订单发起 @@ -275,27 +278,40 @@ public class CreditReviewService { }else { LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData(); loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData(); + creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason()); + List loanCreditAppealPeos = loanCreditAppealApplyDetailsVo.getLoanCreditAppealPeos(); + List shareholderDetailsVos = new ArrayList<>(); + for (LoanCreditAppealPeoDetailsVo loanCreditAppealPeo : loanCreditAppealPeos) { + ShareholderDetailsVo shareholderDetailsVo = new ShareholderDetailsVo(); + shareholderDetailsVo.setShareholderName(loanCreditAppealPeo.getName()); + shareholderDetailsVo.setShareholderIdNumber(loanCreditAppealPeo.getIdCard()); + shareholderDetailsVo.setShareholderMobile(loanCreditAppealPeo.getPhone()); + shareholderDetailsVo.setShareholderRemarks(loanCreditAppealPeo.getRemarks()); + shareholderDetailsVos.add(shareholderDetailsVo); + } + creditReviewDetailsSsVo.setGuarantorList(shareholderDetailsVos); + creditReviewDetailsSsVo.setUploadFiles(loanCreditAppealApplyDetailsVo.getSsImages()); } - 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(); + creditReviewDetailsSsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsSsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsSsVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsSsVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsSsVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsSsVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsSsVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsSsVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsSsVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsSsVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsSsVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsSsVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsSsVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsSsVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsSsVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsSsVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsSsVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsSsVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsSsVo.setManagementName(loanPreloanCreditApplyDetailsVo.getCapitalName()); + //creditReviewDetailsSsVo.setDownUrl(); //参数优化 query.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); //风控要求的其他人员 @@ -312,22 +328,22 @@ public class CreditReviewService { shareholderDetailsVo.setShareholderIdCardImages(loanPreloanCreditPeo.getIdCardImages()); shareholderDetailsVos.add(shareholderDetailsVo); } - creditReviewDetailsoffVo.setShareholderList(shareholderDetailsVos); + creditReviewDetailsSsVo.setShareholderList(shareholderDetailsVos); //公司风控 - creditReviewDetailsoffVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); - creditReviewDetailsoffVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); - creditReviewDetailsoffVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); - creditReviewDetailsoffVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); - creditReviewDetailsoffVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + creditReviewDetailsSsVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsSsVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsSsVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsSsVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsSsVo.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()); + creditReviewDetailsSsVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsSsVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsSsVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsSsVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsSsVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsSsVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); } - return rb.success().setData(creditReviewDetailsoffVo); + return rb.success().setData(creditReviewDetailsSsVo); } public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { @@ -566,6 +582,63 @@ public class CreditReviewService { return rb.success().setData(creditReviewDetailsOffVo); } + public ResultBean getCreditReviewInfo2(String sid) { + ResultBean rb = ResultBean.fireFail(); + LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(sid).getData(); + LoanPreloanCreditApplyDetailsVo loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).getData(); + CreditReviewDetailsSsVo creditReviewDetailsSsVo = new CreditReviewDetailsSsVo(); + creditReviewDetailsSsVo.setSid(loanPreloanCreditApplyDetailsVo.getSid()); + creditReviewDetailsSsVo.setPublishInfo(loanPreloanCreditApplyDetailsVo.getApplyDeptName() + "-" + loanPreloanCreditApplyDetailsVo.getCreateByName()); + creditReviewDetailsSsVo.setCreateTime(DateUtil.formatDate(loanPreloanCreditApplyDetailsVo.getCreateTime())); + creditReviewDetailsSsVo.setCustomerTypeKey(loanPreloanCreditApplyDetailsVo.getCustTypeKey()); + creditReviewDetailsSsVo.setCustomerType(loanPreloanCreditApplyDetailsVo.getCustTypeValue()); + creditReviewDetailsSsVo.setModel(loanPreloanCreditApplyDetailsVo.getModelName()); + creditReviewDetailsSsVo.setModelSid(loanPreloanCreditApplyDetailsVo.getModelSid()); + creditReviewDetailsSsVo.setLegalPersonName(loanPreloanCreditApplyDetailsVo.getCustName()); + creditReviewDetailsSsVo.setLegalPersonSid(loanPreloanCreditApplyDetailsVo.getCustSid()); + creditReviewDetailsSsVo.setLegalPersonMobile(loanPreloanCreditApplyDetailsVo.getPhone()); + creditReviewDetailsSsVo.setLegalPersonIdNumber(loanPreloanCreditApplyDetailsVo.getIdCard()); + creditReviewDetailsSsVo.setLegalPersonIdCardImages(loanPreloanCreditApplyDetailsVo.getIdCardImages()); + creditReviewDetailsSsVo.setUserSid(loanPreloanCreditApplyDetailsVo.getCreateBySid()); + creditReviewDetailsSsVo.setOrgPath(loanPreloanCreditApplyDetailsVo.getOrgSidPath()); + creditReviewDetailsSsVo.setCompanyName(loanPreloanCreditApplyDetailsVo.getQyName()); + creditReviewDetailsSsVo.setCompanySid(loanPreloanCreditApplyDetailsVo.getQySid()); + creditReviewDetailsSsVo.setMaterialImages(loanPreloanCreditApplyDetailsVo.getComFkFiles()); + creditReviewDetailsSsVo.setManagementSid(loanPreloanCreditApplyDetailsVo.getCapitalSid()); + creditReviewDetailsSsVo.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); + } + creditReviewDetailsSsVo.setShareholderList(shareholderDetailsVos); + //公司风控 + creditReviewDetailsSsVo.setSearchResultImages(loanPreloanCreditApplyDetailsVo.getGsQueryResults()); + creditReviewDetailsSsVo.setExamineResultKey(loanPreloanCreditApplyDetailsVo.getGsfkjgKey()); + creditReviewDetailsSsVo.setExamineResult(loanPreloanCreditApplyDetailsVo.getGsfkjg()); + creditReviewDetailsSsVo.setExamineDate(loanPreloanCreditApplyDetailsVo.getGsshDate()); + creditReviewDetailsSsVo.setExamineRemarks(loanPreloanCreditApplyDetailsVo.getGsshRemarks()); + //资方风控 + creditReviewDetailsSsVo.setManageLeave(loanPreloanCreditApplyDetailsVo.getCapitalBalance()); + creditReviewDetailsSsVo.setSearchResultImages2(loanPreloanCreditApplyDetailsVo.getZfQueryResults()); + creditReviewDetailsSsVo.setExamineResultKey2(loanPreloanCreditApplyDetailsVo.getZffkjgKey()); + creditReviewDetailsSsVo.setExamineResult2(loanPreloanCreditApplyDetailsVo.getZffkjg()); + creditReviewDetailsSsVo.setExamineDate2(loanPreloanCreditApplyDetailsVo.getZfshDate()); + creditReviewDetailsSsVo.setExamineRemarks2(loanPreloanCreditApplyDetailsVo.getZfshRemarks()); + //申诉结果 + creditReviewDetailsSsVo.setReason(loanCreditAppealApplyDetailsVo.getAppealReason()); + return rb.success().setData(creditReviewDetailsSsVo); + } + public ResultBean submitCreditReviewInfo2(CreditReviewOffDto dto) { ResultBean rb = ResultBean.fireFail(); @@ -626,4 +699,24 @@ public class CreditReviewService { } + public ResultBean saveCreditReviewInfo3(CreditReviewSsDto dto) { + LoanCreditAppealApplyDto loanCreditAppealApplyDto = new LoanCreditAppealApplyDto(); + List guarantorList = dto.getGuarantorList(); + List loanCreditAppealPeoDtos = new ArrayList<>(); + for (ShareholderDetailsVo shareholderDetailsVo : guarantorList) { + LoanCreditAppealPeoDto loanCreditAppealPeoDto = new LoanCreditAppealPeoDto(); + loanCreditAppealPeoDto.setName(shareholderDetailsVo.getShareholderName()); + loanCreditAppealPeoDto.setIdCard(shareholderDetailsVo.getShareholderIdNumber()); + loanCreditAppealPeoDto.setPhone(shareholderDetailsVo.getShareholderMobile()); + loanCreditAppealPeoDto.setRemarks(shareholderDetailsVo.getShareholderRemarks()); + loanCreditAppealPeoDtos.add(loanCreditAppealPeoDto); + } + loanCreditAppealApplyDto.setLoanCreditAppealPeos(loanCreditAppealPeoDtos); + loanCreditAppealApplyDto.setAppealReason(dto.getReason()); + loanCreditAppealApplyDto.setSsImages(dto.getUploadFiles()); + loanCreditAppealApplyFeign.save(loanCreditAppealApplyDto); + return new ResultBean().success(); + } + + }