排产流程id修改

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -515,7 +515,6 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             return voResultBean;
         }
         if (r == 2) {
-            bv.setModelId(busVehicleApply.get().getProcDefId());
             // ToDo:驳回到发起人后再次提交
             if (StringUtils.isBlank(dto.getInstanceId())) {
                 return rb.setMsg("参数错误：instanceId");
@@ -587,7 +586,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
         bv.setOrgSidPath(busVehicleApply.getOrgSidPath());
-
+        bv.setModelId(busVehicleApply.getProcDefId());
         if (bv.getTaskId().equals(busVehicleApply.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
@@ -699,7 +698,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
-        bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
+        bv.setModelId(busVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
@@ -724,7 +723,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
         //判断是否是储备订单，若是，则isTrue网关参数为true=============添加
         variables.put("isTrue", DictCommonEnum.schedulingType.CB_SCHEDULINGTYPE.getCode().equals(busVehicleApply.getSchedulingTypeKey()));
         bv.setFormVariables(variables);
-        bv.setModelId(ProcDefEnum.VEHICLEAPPLY.getProDefId());
+        bv.setModelId(busVehicleApply.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());