From 78b9401d01f8795cb278032502b7a89025775c8a Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 22 Sep 2023 11:50:50 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E3=80=81=E5=85=B6=E4=BB=96=E8=9E=8D=E5=A4=87=E6=A1=88=E7=BB=88?= =?UTF-8?q?=E6=AD=A2=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=A4=87=E6=A1=88?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyRecordApplyService.java | 26 +++++++++++++++ .../LoanFinPolicyRecordApplyService.java | 32 ++++++++++++++++++- 2 files changed, 57 insertions(+), 1 deletion(-) 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..aae4bdaeec 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 @@ -5,6 +5,8 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.base.api.basedistributor.BaseDistributor; +import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; @@ -237,7 +239,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 +547,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 +573,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()); } } From df6fb6ef25c9c0683d8a28529a2e0626380012ee Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 22 Sep 2023 13:52:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=A4=E6=96=AD=E9=A6=96=E4=BB=98=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E4=B8=8D=E8=83=BD=E4=BD=8E=E4=BA=8E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=A6=96=E4=BB=98=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/loansolutions/calculate/CalculateQuery.java | 4 ++-- .../biz/loansolutions/LoanSolutionsService.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) 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/loansolutions/LoanSolutionsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java index e69f3ab2da..21246191d6 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 Date: Fri, 22 Sep 2023 13:59:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=87=91=E8=9E=8D=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=88=A4=E6=96=AD=E9=A6=96=E4=BB=98=E6=AF=94?= =?UTF-8?q?=E4=BE=8B=E4=B8=8D=E8=83=BD=E4=BD=8E=E4=BA=8E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E6=94=BF=E7=AD=96=E9=A6=96=E4=BB=98=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanFinOtherPolicyRecordApplyRest.java | 1 - .../LoanFinPolicyRecordApplyService.java | 2 -- 2 files changed, 3 deletions(-) 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/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinpolicyrecordapply/LoanFinPolicyRecordApplyService.java index aae4bdaeec..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 @@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import com.yxt.anrui.base.api.basedistributor.BaseDistributor; -import com.yxt.anrui.base.api.basedistributorapply.BaseDistributorApply; import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; From d5812028a52ad28f6e57c21ab0e9ab44fe5c351e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 22 Sep 2023 14:19:56 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=87=91?= =?UTF-8?q?=E8=9E=8D=E6=96=B9=E6=A1=88=E8=AE=A1=E7=AE=97=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E9=A6=96=E4=BB=98=E6=AF=94=E4=BE=8B=E4=B8=8D=E8=83=BD=E4=BD=8E?= =?UTF-8?q?=E4=BA=8E=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E9=A6=96=E4=BB=98?= =?UTF-8?q?=E6=AF=94=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../riskcenter/biz/loansolutions/LoanSolutionsService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 21246191d6..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 @@ -2358,7 +2358,12 @@ public class LoanSolutionsService extends MybatisBaseService