diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java index 984dd94aa2..af3e27bd3b 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/calculate/CalculateQuery.java @@ -37,8 +37,8 @@ public class CalculateQuery { private boolean purchaseTaxCb; @ApiModelProperty("融资项目总额") private String loanTotal; - /* @ApiModelProperty("首付款比例") - private String downPayRatio;*/ + @ApiModelProperty("首付款比例") + private String downPayRatio; @ApiModelProperty("首付金额") private String downPayAmount; @ApiModelProperty("贷款金额") diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java index bdd3622815..da157012b4 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyRest.java @@ -1,7 +1,6 @@ package com.yxt.anrui.riskcenter.biz.loanfinotherpolicyrecordapply; import cn.hutool.core.bean.BeanUtil; -import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.anrui.riskcenter.api.loanfinotherpolicyrecordapply.*; diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java index b1109fd6ee..7aa2ab3362 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherpolicyrecordapply/LoanFinOtherPolicyRecordApplyService.java @@ -578,6 +578,19 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //终止任务后备案状态改完未备案 + LoanFinOtherPolicyRecordApply loanFinOtherPolicyRecordApply = fetchBySid(query.getBusinessSid()); + if (loanFinOtherPolicyRecordApply.getNodeState().equals("终止")) { + String policySids = loanFinOtherPolicyRecordApply.getOtherPolicySid(); + List strings = Arrays.asList(policySids.split(",")); + if (!strings.isEmpty()) { + for (String sid : strings) { + LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(sid); + loanFinOtherPolicy.setFilingState(0); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } + } return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -589,6 +602,19 @@ public class LoanFinOtherPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //终止任务后备案状态改完未备案 + LoanFinOtherPolicyRecordApply loanFinOtherPolicyRecordApply = fetchBySid(query.getBusinessSid()); + if (loanFinOtherPolicyRecordApply.getNodeState().equals("终止")) { + String policySids = loanFinOtherPolicyRecordApply.getOtherPolicySid(); + List strings = Arrays.asList(policySids.split(",")); + if (!strings.isEmpty()) { + for (String sid : strings) { + LoanFinOtherPolicy loanFinOtherPolicy = loanFinOtherPolicyService.fetchBySid(sid); + loanFinOtherPolicy.setFilingState(0); + loanFinOtherPolicyService.updateById(loanFinOtherPolicy); + } + } + } return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java index 77c5cc9d3d..658731c1e6 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java @@ -237,7 +237,7 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid); + // List otherPolicy = loanFinOtherPolicyService.getOtherPolicyByMainSid(psid); List otherPolicy = loanFinOtherPolicyService.fetchByMainSid(psid); otherPolicy.removeAll(Collections.singleton(null)); initVo.setShowOtherPolicy(!otherPolicy.isEmpty()); @@ -545,6 +545,21 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + + //终止任务后经销商备案状态改完未备案 + LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid()); + if (loanFinPolicyRecordApply.getNodeState().equals("终止")) { + String policySids = loanFinPolicyRecordApply.getPolicySid(); + List strings = Arrays.asList(policySids.split(",")); + if (!strings.isEmpty()) { + for (String sid : strings) { + LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(sid); + loanFinPolicy.setFilingState(0); + loanFinPolicyService.updateById(loanFinPolicy); + } + } + } + return rb.success().setData(resultBean.getData()); } else { if (businessTaskId.equals(query.getTaskId())) { @@ -556,6 +571,19 @@ public class LoanFinPolicyRecordApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); updateFlowFiled(map); + //终止任务后经销商备案状态改完未备案 + LoanFinPolicyRecordApply loanFinPolicyRecordApply = fetchBySid(query.getBusinessSid()); + if (loanFinPolicyRecordApply.getNodeState().equals("终止")) { + String policySids = loanFinPolicyRecordApply.getPolicySid(); + List strings = Arrays.asList(policySids.split(",")); + if (!strings.isEmpty()) { + for (String sid : strings) { + LoanFinPolicy loanFinPolicy = loanFinPolicyService.fetchBySid(sid); + loanFinPolicy.setFilingState(0); + loanFinPolicyService.updateById(loanFinPolicy); + } + } + } return rb.success().setData(resultBean.getData()); } } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index e69f3ab2da..f061463efc 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java @@ -1430,6 +1430,11 @@ public class LoanSolutionsService extends MybatisBaseService