diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 1235db4b6e..13eb60ec77 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -3878,6 +3878,8 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(businessSid); AppOrderDetailsVo vo = resultBean.getData(); if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) { @@ -4135,6 +4137,8 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); bv.setOrgSidPath(busSalesOrder.getOrgSidPath()); + //流程定义id + bv.setModelId(busSalesOrder.getProcDefId()); if (bv.getTaskId().equals(busSalesOrder.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -4409,7 +4413,8 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); - bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); +// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); + bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusSaleOrderNodeVo.class)).collect(Collectors.toList()); @@ -4431,7 +4436,8 @@ public class BusSalesOrderService extends MybatisBaseService variables = getOrderMap(busSalesOrder); bv.setFormVariables(variables); - bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); +// bv.setModelId(ProcDefEnum.SALESORDER.getProDefId()); + bv.setModelId(busSalesOrder.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusSaleOrderNodeVo.class)).collect(Collectors.toList()); @@ -4906,7 +4912,8 @@ public class BusSalesOrderService extends MybatisBaseService - + com.yxt yxt-parent 0.0.1 @@ -79,6 +79,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + com.yxt.anrui + anrui-flowable-api + 0.0.1-SNAPSHOT + compile + diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java index 6546639b6a..6011557a12 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/RiskCenterApplication.java @@ -14,7 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; "com.yxt.anrui.riskcenter" }) @EnableDiscoveryClient -@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.anrui.crm","com.yxt.anrui.base"}) +@EnableFeignClients(basePackages = {"com.yxt.anrui.portal","com.yxt.anrui.buscenter","com.yxt.anrui.crm","com.yxt.anrui.base","com.yxt.anrui.flowable"}) public class RiskCenterApplication { public static void main(String[] args) {