diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
index da27f5468d..d945119fd0 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
@@ -131,6 +131,8 @@ public class AppOrderDetailsVo implements Vo {
@ApiModelProperty("是否有金融方案")
private boolean finState;
+ @ApiModelProperty("环节标识")
+ private String taskDefKey;
}
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 2874a2883a..f8fc36c301 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
@@ -3,6 +3,8 @@ package com.yxt.anrui.riskcenter.biz.loansolutions;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDto;
@@ -19,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.List;
/**
* Project: anrui-riskcenter(风控中心)
@@ -43,6 +46,9 @@ public class LoanSolutionsService extends MybatisBaseService selectDetails(String saleOrderSid) {
ResultBean rb = ResultBean.fireFail();
SolutionsDetailsVo solutionsDetailsVo = new SolutionsDetailsVo();
@@ -78,9 +84,25 @@ public class LoanSolutionsService extends MybatisBaseService detailsVoResultBean = busSalesOrderFeign.getSaleOrderDetails(dto.getSaleOrderSid());
+ if (detailsVoResultBean.getData() != null) {
+ AppOrderDetailsVo appOrderDetailsVo = detailsVoResultBean.getData();
+ if (StringUtils.isNotBlank(appOrderDetailsVo.getProcInsId())) {
+ ResultBean> listResultBean = flowTaskFeign.getLatestTasks(appOrderDetailsVo.getProcInsId());
+ if (listResultBean.getData() != null && listResultBean.getData().size() > 0) {
+ LatestTaskVo latestTaskVo = listResultBean.getData().get(0);
+ if (!"Activity_0z788pp".equals(latestTaskVo.getTask_def_key_()) && !"Activity_1ckx8lq".equals(latestTaskVo.getTask_def_key_())) {
+ return rb.setMsg("当前所处环节不允许修改金融方案");
+ }
+ }
+ }
+ }
+
//查询金融方案
LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(dto.getSaleOrderSid());
if (loanSolutions != null) {
@@ -91,23 +113,23 @@ public class LoanSolutionsService extends MybatisBaseService