Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 2 years ago
parent
commit
1d7b8afbea
  1. 13
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailed.java
  2. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finfundscarriedforwardapply/FinFundsCarriedForwardApplyService.java
  3. 66
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  4. 37
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  5. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicy.java
  6. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java
  7. 20
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyQuery.java
  8. 3
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java
  9. 12
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyVo.java
  10. 6
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
  11. 58
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java
  12. 26
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
  13. 2
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsQuery.java
  14. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java
  15. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeignFallback.java
  16. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewRest.java
  17. 86
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/creditreview/CreditReviewService.java

13
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;
}

8
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<FinFu
finSelectedReceivablesDetailed.setPayType(yxysFinFundsCarriedForwardYXYSKXVo.getPayType());
finSelectedReceivablesDetailed.setPayTypeKey(yxysFinFundsCarriedForwardYXYSKXVo.getPayTypeKey());
finSelectedReceivablesDetailed.setUseOrgSid(dto.getUseOrgSid());
finSelectedReceivablesDetailed.setUseOrgName(dto.getUseOrgName());
finSelectedReceivablesDetailed.setSubscribedOf(yxysFinFundsCarriedForwardYXYSKXVo.getSubscribedOf());
finSelectedReceivablesDetailed.setCollSid(finFundsCarriedForwardApply.getSid());
finSelectedReceivablesDetailed.setKxState("01");
finSelectedReceivablesDetailed.setOrgSidPath(dto.getOrgSidPath());
finSelectedReceivablesDetailed.setStaffName(dto.getStaffName());
String staffSid = dto.getStaffSid();
SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(staffSid).getData();
finSelectedReceivablesDetailed.setStaffUserSid(sysUserVo.getSid());
finSelectedReceivablesDetailed.setStaffDeptSid(dto.getSaleDeptSid());
finSelectedReceivablesDetailed.setStaffDeptName(dto.getSaleDeptName());
String receivablesSid = yxysFinFundsCarriedForwardYXYSKXVo.getReceivablesSid();
FinUncollectedReceivablesDetailed finUncollectedReceivablesDetailed = finUncollectedReceivablesDetailedService.fetchBySid(receivablesSid);
finSelectedReceivablesDetailed.setPurchaseSystemSid(finUncollectedReceivablesDetailed.getPurchaseSystemSid());

66
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -379,11 +379,11 @@
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
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"
)
<where>
${ew.sqlSegment}
</where>
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

37
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<Fi
orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("fcc.orgSidPath", orgSidPath);
qw.like("ferd.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fcc.orgSidPath", orgSidPath);
qw.like("ferd.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fcc.orgSidPath", orgSidPath);
qw.like("ferd.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fcc.orgSidPath", orgSidPath);
qw.like("ferd.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
//qw.eq("fcc.createBySid", query.getUserSid());
qw.eq("ferd.createBySid", query.getUserSid());
} else {
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
@ -572,10 +572,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
qw.eq("ferd.auditState", 3);
qw.eq("ferd.kxState","01");
if (StringUtils.isNotBlank(query.getStaffDeptName())) {
qw.and(wrapper -> 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<Fi
qw.like("ferd.VIN", query.getVinNo());
}
if (StringUtils.isNotBlank(query.getName())) {
qw.and(wrapper -> 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<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
}
qw.having("reveivableMoney > 0");
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> 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<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}

3
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;
}

2
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;
}

20
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;
}

3
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;
}

12
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;
}

6
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<LoanCreditA
qw.like("lp.phone", query.getPhone());
}
if (StringUtils.isNotBlank(query.getGsfkjg())) {
qw.like("lp.gsfkjg", query.getGsfkjg());
qw.eq("lp.gsfkjg", query.getGsfkjg());
}
if (StringUtils.isNotBlank(query.getZffkjg())) {
qw.like("lp.zffkjg", query.getZffkjg());
qw.eq("lp.zffkjg", query.getZffkjg());
}
if (StringUtils.isNotBlank(query.getSsjg())) {
qw.like("lp.ssjg", query.getSsjg());
qw.eq("lp.ssjg", query.getSsjg());
}
if (StringUtils.isNotBlank(query.getName())) {
}

58
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.riskcenter.api.loanfinotherPolicy.*;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicy;
import com.yxt.anrui.riskcenter.api.loanfinpolicy.LoanFinPolicyStateQuery;
@ -36,6 +37,8 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private SysUserFeign sysUserFeign;
/**
* 根据主产品sid查询
@ -83,7 +86,45 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
public PagerVo<LoanFinOtherPolicyPageVo> listPageVo(PagerQuery<LoanFinOtherPolicyQuery> pq) {
LoanFinOtherPolicyQuery query = pq.getParams();
QueryWrapper<LoanPreloanCreditApply> 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<String> 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<LoanFinOtherPolicyPageVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<LoanFinOtherPolicyPageVo> p = new PagerVo<>();
return p;
}
}
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
@ -96,18 +137,21 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
if (StringUtils.isNotBlank(query.getUseSate())) {
qw.eq("useSate", query.getUseSate());
}
if (StringUtils.isNotBlank(query.getBusTypeValue())) {
qw.like("busTypeValue", query.getBusTypeValue());
if (StringUtils.isNotBlank(query.getBusTypeKey())) {
qw.eq("busTypeKey", query.getBusTypeKey());
}
if (StringUtils.isNotBlank(query.getVehCategoryValue())) {
qw.like("vehCategoryValue", query.getVehCategoryValue());
if (StringUtils.isNotBlank(query.getVehCategoryKey())) {
qw.eq("vehCategoryKey", query.getVehCategoryKey());
}
if (StringUtils.isNotBlank(query.getVehTypeValue())) {
qw.like("vehTypeValue", query.getVehTypeValue());
if (StringUtils.isNotBlank(query.getVehTypeKey())) {
qw.eq("vehTypeKey", query.getVehTypeKey());
}
if (StringUtils.isNotBlank(query.getOtherPolicyName())) {
qw.like("otherPolicyName", query.getOtherPolicyName());
}
if (StringUtils.isNotBlank(query.getPeriodKey())) {
qw.eq("periodKey", query.getPeriodKey());
}
if (StringUtils.isNotBlank(query.getYearRatio())) {
qw.like("yearRatio", query.getYearRatio());
}

26
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java

@ -131,10 +131,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
qw.like("phone", query.getPhone());
}
if (StringUtils.isNotBlank(query.getGsfkjg())) {
qw.like("gsfkjg", query.getGsfkjg());
qw.eq("gsfkjg", query.getGsfkjg());
}
if (StringUtils.isNotBlank(query.getZffkjg())) {
qw.like("zffkjg", query.getZffkjg());
qw.eq("zffkjg", query.getZffkjg());
}
if (StringUtils.isNotBlank(query.getType())) {
if ("1".equals(query.getType())) {
@ -155,18 +155,10 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
record.setShowUpdateBtn(true);
record.setIsDelete(true);
record.setShowDeleteBtn(true);
} else {
record.setIsEdit(false);
record.setShowUpdateBtn(false);
record.setIsDelete(false);
record.setShowDeleteBtn(false);
}
if ("002".equals(record.getGsfkjgKey()) && !"通过".equals(record.getSsjg())){
record.setIsHandle(true);
record.setShowHandleBtn(true);
}else {
record.setShowHandleBtn(false);
record.setIsHandle(false);
}
record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
}
@ -266,20 +258,6 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
if ("0".equals(state)) {
record.setIsEdit(true);
record.setShowUpdateBtn(true);
record.setIsDelete(false);
record.setShowDeleteBtn(false);
} else {
record.setIsEdit(false);
record.setShowUpdateBtn(false);
record.setIsDelete(false);
record.setShowDeleteBtn(false);
}
if ("002".equals(record.getGsfkjgKey())){
record.setIsHandle(true);
record.setShowHandleBtn(true);
}else {
record.setShowHandleBtn(false);
record.setIsHandle(false);
}
record.setPublishInfo(record.getApplyDeptName() + "-" + record.getCreateByName());
}

2
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewDetailsQuery.java

@ -20,4 +20,6 @@ public class CreditReviewDetailsQuery implements Query {
private int createSource;
@ApiModelProperty("来源的sid 1意向的sid 2销售订单的sid")
private String sourceSid;
@ApiModelProperty("申诉来源 true贷前信用审核发起申诉 false申诉申请回显")
private Boolean addNew;
}

5
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/creditreview/CreditReviewFeign.java

@ -39,6 +39,11 @@ public interface CreditReviewFeign {
@ResponseBody
public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo2(@SpringQueryMap CreditReviewDetailsQuery query);
@ApiOperation("申诉初始化")
@GetMapping("/initCreditReviewInfo3")
@ResponseBody
public ResultBean<CreditReviewDetailsOffVo> initCreditReviewInfo3(@SpringQueryMap CreditReviewDetailsQuery query);
@ApiOperation("详情")
@GetMapping("/getCreditReviewInfo")
@ResponseBody

5
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<CreditReviewDetailsOffVo> initCreditReviewInfo3(CreditReviewDetailsQuery query) {
return null;
}
@Override
public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(String sid) {
return null;

5
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<CreditReviewDetailsOffVo> initCreditReviewInfo3(CreditReviewDetailsQuery query) {
return creditReviewService.initCreditReviewInfo3(query);
}
@Override
public ResultBean<CreditReviewDetailsOffVo> getCreditReviewInfo(String sid) {
return creditReviewService.getCreditReviewInfo(sid);

86
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<CreditReviewDetailsOffVo> 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<ShareholderDetailsVo> shareholderDetailsVos = new ArrayList<>();
List<LoanPreloanCreditPeoDetailsVo> 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<List<IdentityDetailsVo>> 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();
}
}

Loading…
Cancel
Save