From 73d81474cda8fcd88e3af471fdc52a59108cbc6d Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 1 Aug 2023 14:28:26 +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 --- .../FinSelectedReceivablesDetailed.java | 13 +++ .../FinFundsCarriedForwardApplyService.java | 8 ++ .../FinSelectedReceivablesDetailedMapper.xml | 66 ++------------ ...FinSelectedReceivablesDetailedService.java | 37 ++------ .../LoanFinOtherPolicy.java | 3 +- .../LoanFinOtherPolicyDtos.java | 2 + .../LoanFinOtherPolicyQuery.java | 20 +++-- .../LoanFinOtherPolicyVos.java | 3 + .../LoanPreloanCreditApplyVo.java | 12 +-- .../LoanCreditAppealApplyService.java | 6 +- .../LoanFinOtherPolicyService.java | 58 +++++++++++-- .../LoanPreloanCreditApplyService.java | 26 +----- .../CreditReviewDetailsQuery.java | 2 + .../risk/creditreview/CreditReviewFeign.java | 5 ++ .../CreditReviewFeignFallback.java | 5 ++ .../risk/creditreview/CreditReviewRest.java | 5 ++ .../creditreview/CreditReviewService.java | 86 +++++++++++++++++++ 17 files changed, 222 insertions(+), 135 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java index 88fdd1a2a6..26cae4a021 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java @@ -104,4 +104,17 @@ public class FinSelectedReceivablesDetailed extends BaseEntity { private String purchaseSystemSid; @ApiModelProperty("采购系统名称") private String purchaseSystemName; + @ApiModelProperty("销售专员姓名") + private String staffName; + @ApiModelProperty("销售专员userSid") + private String staffUserSid; + @ApiModelProperty("销售部门") + private String staffDeptName; + @ApiModelProperty("销售部门sid") + private String staffDeptSid; + @ApiModelProperty("分公司名称") + private String useOrgName; + @ApiModelProperty("组织全路径") + private String orgSidPath; + } 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 eba95d7070..a04547e98e 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 @@ -494,9 +494,17 @@ public class FinFundsCarriedForwardApplyService extends MybatisBaseService SELECT ferd.sid, - fcc.createBySid AS createBySid, - fcc.`useOrgSid`, - fcc.`staffDeptName` AS staffDeptName, - su.staffSid AS staffSid, - fcc.`staffName` AS staffName, + ferd.`createBySid`, + ferd.`useOrgName`, + ferd.`staffDeptName`, + ferd.`staffUserSid` AS staffSid, + ferd.`staffName`, ferd.`contractNo`, ferd.`payType`, ferd.`customerName`, @@ -397,11 +397,12 @@ ( ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) ) AS reveivableMoney, - ferd.kxState AS state + CASE ferd.kxState + WHEN 01 THEN '正常' + WHEN 02 THEN '退车' + WHEN 03 THEN '作废' END AS state, FROM fin_selected_receivables_detailed ferd - LEFT JOIN fin_collection_confirmation fcc - ON ferd.`collSid` = fcc.`sid` LEFT JOIN (SELECT ffc.busSid, @@ -412,55 +413,6 @@ ON ffc.mainSid = fa.sid WHERE fa.`nodeState` != '终止') ffc ON ffc.`busSid` = ferd.`sid` - JOIN anrui_portal.`sys_user` su - ON fcc.`staffUserSid` = su.sid - JOIN fin_uncollected_receivables_detailed furd - ON ferd.`receivablesSid` = furd.`sid` - JOIN anrui_base.`base_vehicle_state` bvs - ON furd.busVinSid = bvs.busSid - AND ( - bvs.`busNo` = "200" - OR bvs.`busState` = "401" - ) - - ${ew.sqlSegment} - - UNION - SELECT - ferd.sid, - ffcfa.createBySid AS createBySid, - ffcfa.useOrgSid, - ffcfa.saleDeptName AS staffDeptName, - ffcfa.staffSid, - ffcfa.`staffName` AS staffName, - ferd.`contractNo`, - ferd.`payType`, - ferd.`customerName`, - ferd.`customerPhone`, - ferd.`VIN` AS vinNo, - ferd.`receivablesName`, - ferd.`auditDate`, - ferd.`subscriptionMoney`, - ferd.purchaseSystemSid, - ferd.purchaseSystemName, - ( - ferd.`subscriptionMoney` - COALESCE(SUM(ffc.`thisUseMoney`), 0) - ) AS reveivableMoney, - ferd.kxState AS state - FROM - fin_selected_receivables_detailed ferd - LEFT JOIN fin_funds_carried_forward_apply ffcfa - ON ferd.`collSid` = ffcfa.`sid` - LEFT JOIN - (SELECT - ffc.busSid, - ffc.thisUseMoney - FROM - fin_funds_carried_forward_veh ffc - JOIN `fin_funds_carried_forward_apply` ffcfa - ON ffc.mainSid = ffcfa.sid - WHERE ffcfa.`nodeState` != '终止') ffc - ON ffc.`busSid` = ferd.`sid` JOIN fin_uncollected_receivables_detailed furd ON ferd.`receivablesSid` = furd.`sid` JOIN anrui_base.`base_vehicle_state` bvs diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index 1f9a9e426b..c4af687432 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -548,18 +548,18 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService p = new PagerVo<>(); return p; @@ -572,10 +572,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("fcc.staffDeptName", query.getStaffDeptName()).or().like("ffcfa.saleDeptName", query.getStaffDeptName())); + qw.like("ferd.staffDeptName", query.getStaffDeptName()); } if (StringUtils.isNotBlank(query.getStaffName())) { - qw.and(wrapper -> wrapper.like("fcc.staffName", query.getStaffName()).or().like("ffcfa.staffName", query.getStaffName())); + qw.like("ferd.staffName", query.getStaffName()); } if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("ferd.contractNo", query.getContractNo()); @@ -590,34 +590,15 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService wrapper.like("ferd.contractNo", query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName())); + qw.and(wrapper -> wrapper.like("ferd.contractNo", query.getName()).or().like("ferd.staffDeptName",query.getName()).or().like("ferd.staffName",query.getName()).or().like("ferd.customerName", query.getName()).or().like("ferd.customerPhone", query.getName()).or().like("ferd.VIN", query.getName())); } qw.groupBy("ferd.sid"); - if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && !"5".equals(orgLevelKey)){ + if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney())){ qw.having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney()); - }else if (StringUtils.isNotBlank(query.getBalanceSmallMoney()) && StringUtils.isNotBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){ - qw.having("createBySid = {0}",query.getUserSid()).having("reveivableMoney >= {0}",query.getBalanceSmallMoney()).having("reveivableMoney <= {0}",query.getBalanceBigMoney()); - }else if (StringUtils.isBlank(query.getBalanceSmallMoney()) && StringUtils.isBlank(query.getBalanceBigMoney()) && "5".equals(orgLevelKey)){ - qw.having("createBySid = {0}",query.getUserSid()); - }else { - PagerVo p = new PagerVo<>(); - return p; } qw.having("reveivableMoney > 0"); IPage page = PagerUtil.queryToPage(pagerQuery); IPage pagging = baseMapper.noOutVehRecPageList(page, qw); - for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) { - String useOrgSid = record.getUseOrgSid(); - String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName(); - record.setUseOrgName(useOrgName); - if ("01".equals(record.getState())){ - record.setState("正常"); - }else if ("02".equals(record.getState())){ - record.setState("退车"); - }else if ("03".equals(record.getState())){ - record.setState("作废"); - } - } PagerVo p = PagerUtil.pageToVo(pagging, null); return p; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java index 3daad8eb06..48d333495a 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java @@ -69,6 +69,5 @@ public class LoanFinOtherPolicy extends BaseEntity { private String useOrgSid; @ApiModelProperty("使用组织名称") private String useOrgName; - - + private String orgSidPath; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java index 350148b8b7..26367b980e 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java @@ -17,6 +17,7 @@ import java.util.List; public class LoanFinOtherPolicyDtos implements Dto { private String sid; + private String createBySid; @ApiModelProperty("资方名称") private String bankShortName; @ApiModelProperty("其他融名称（资方+产品类别+最高融资比例+期数）") @@ -66,4 +67,5 @@ public class LoanFinOtherPolicyDtos implements Dto { private String useOrgSid; @ApiModelProperty("使用组织名称") private String useOrgName; + private String orgSidPath; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java index 8b885d81d1..a67c7923bf 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java @@ -14,6 +14,10 @@ import java.math.BigDecimal; @Data public class LoanFinOtherPolicyQuery implements Query { + @ApiModelProperty("用户sid") + private String userSid; + private String menuUrl; + private String orgSidPath; @ApiModelProperty("报备状态：1已报备，0未报备") private String filingState; @ApiModelProperty("风控状态：1禁用 0正常 风控中心设置的状态") @@ -24,20 +28,20 @@ public class LoanFinOtherPolicyQuery implements Query { private String createOrgSid; @ApiModelProperty("创建组织名称") private String createOrgName; - @ApiModelProperty("业务类型value") - private String busTypeValue; - @ApiModelProperty("车辆大类value") - private String vehCategoryValue; - @ApiModelProperty("车辆功能value") - private String vehTypeValue; + @ApiModelProperty("业务类型Key") + private String busTypeKey; + @ApiModelProperty("车辆大类Key") + private String vehCategoryKey; + @ApiModelProperty("车辆功能Key") + private String vehTypeKey; @ApiModelProperty("产品名称：组合（资方+产品类别+最高融资比例+期数）") private String otherPolicyName; @ApiModelProperty("开始有效期至") private String validStartDateTo; @ApiModelProperty("结束有效期至") private String validEndDateTo; - @ApiModelProperty("期数") - private String period; + @ApiModelProperty("期数Key") + private String periodKey; @ApiModelProperty("年利率（%）") private String yearRatio; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java index 361c1411b5..c1a8e22f7c 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java @@ -15,6 +15,8 @@ import java.util.List; @Data public class LoanFinOtherPolicyVos { + private String sid; + private String createBySid; @ApiModelProperty("资方名称") private String bankShortName; @ApiModelProperty("其他融名称（资方+产品类别+最高融资比例+期数）") @@ -56,4 +58,5 @@ public class LoanFinOtherPolicyVos { private String yearRatio; @ApiModelProperty("有效期至") private String validDateTo; + private String orgSidPath; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java index 2eda3c94ed..05e53cb5aa 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java @@ -78,15 +78,15 @@ public class LoanPreloanCreditApplyVo implements Vo { @ApiModelProperty("申诉结果") private String ssjg; @ApiModelProperty("是否可以办理") - private Boolean isEdit; + private Boolean isEdit = false; @ApiModelProperty("是否可以删除") - private Boolean isDelete; + private Boolean isDelete = false; @ApiModelProperty("是否可以申诉") - private Boolean isHandle; + private Boolean isHandle = false; @ApiModelProperty("是否显示修改审核后显示") - private Boolean showUpdateBtn; + private Boolean showUpdateBtn = false; @ApiModelProperty("是否显示删除 审核后不显示") - private Boolean showDeleteBtn; + private Boolean showDeleteBtn = false; @ApiModelProperty("是否显示申诉 审核后显示") - private Boolean showHandleBtn; + private Boolean showHandleBtn = false; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java index 7d7fad44d4..a4d0963f10 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java @@ -184,13 +184,13 @@ public class LoanCreditAppealApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { LoanFinOtherPolicyQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("createOrgSid",query.getCreateOrgSid()); + if (StringUtils.isNotBlank(query.getMenuUrl())) { + //======================= + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgSidPath()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + privilegeQuery.setUserSid(query.getUserSid()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgSidPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { + qw.eq("createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } if (StringUtils.isNotBlank(query.getCreateOrgName())) { qw.like("createOrgName", query.getCreateOrgName()); } @@ -96,18 +137,21 @@ public class LoanFinOtherPolicyService extends MybatisBaseService initCreditReviewInfo2(@SpringQueryMap CreditReviewDetailsQuery query); + @ApiOperation("申诉初始化") + @GetMapping("/initCreditReviewInfo3") + @ResponseBody + public ResultBean initCreditReviewInfo3(@SpringQueryMap CreditReviewDetailsQuery query); + @ApiOperation("详情") @GetMapping("/getCreditReviewInfo") @ResponseBody 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 db8b741c32..cc134d1b6b 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 @@ -29,6 +29,11 @@ public class CreditReviewFeignFallback implements CreditReviewFeign { return null; } + @Override + public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { + return null; + } + @Override public ResultBean getCreditReviewInfo(String sid) { return null; 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 80ced5e45b..4826ea570a 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 @@ -39,6 +39,11 @@ public class CreditReviewRest implements CreditReviewFeign { return creditReviewService.initCreditReviewInfo2(query); } + @Override + public ResultBean initCreditReviewInfo3(CreditReviewDetailsQuery query) { + return creditReviewService.initCreditReviewInfo3(query); + } + @Override public ResultBean getCreditReviewInfo(String sid) { return creditReviewService.getCreditReviewInfo(sid); 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 b02715612f..dcf4c04087 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 @@ -12,6 +12,8 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; 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.LoanCreditAppealApplyFeign; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankDto; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBankFeign; import com.yxt.anrui.riskcenter.api.loanfinbank.LoanFinBanksVo; @@ -53,6 +55,8 @@ public class CreditReviewService { @Autowired private LoanPreloanCreditApplyFeign loanPreloanCreditApplyFeign; @Autowired + private LoanCreditAppealApplyFeign loanCreditAppealApplyFeign; + @Autowired private SysOrganizationFeign sysOrganizationFeign; @Autowired private SysUserFeign sysUserFeign; @@ -246,6 +250,86 @@ public class CreditReviewService { return rb.success().setData(creditReviewDetailsoffVo); } + public ResultBean initCreditReviewInfo3(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; + if (query.getAddNew()){ + loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + }else { + LoanCreditAppealApplyDetailsVo loanCreditAppealApplyDetailsVo = loanCreditAppealApplyFeign.fetchDetailsBySid(query.getSid()).getData(); + loanPreloanCreditApplyDetailsVo = loanPreloanCreditApplyFeign.fetchDetailsBySid(loanCreditAppealApplyDetailsVo.getCreditApplySid()).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()); + } + return rb.success().setData(creditReviewDetailsoffVo); + } + public ResultBean> selModelByUseOrgSid(CreditReviewDetailsQuery query) { ResultBean rb = ResultBean.fireFail(); String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); @@ -540,4 +624,6 @@ public class CreditReviewService { loanPreloanCreditApplyFeign.finStaffConfirm(loanPreloanCreditApplyDto); return rb.success(); } + + }