未售买断流程图更改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/ActualGetNodeQuery.java

@@ -17,7 +17,6 @@ public class ActualGetNodeQuery implements Query {
 
     @ApiModelProperty(value = "环节定义id")
     private String taskDefKey;
-
-//    @ApiModelProperty(value = "分支字段及业务字段")
-//    private Map<String, Object> formVariables;
+    @ApiModelProperty("业务sid")
+    private String businessSid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -588,6 +588,7 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             variables.put("app", appMap);
             bv.setFormVariables(variables);
             bv.setOrgSidPath(baseVehicleActualSales.getOrgSidPath());
+            bv.setModelId(baseVehicleActualSales.getProcDefId());
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
             if (!resultBean.getSuccess()) {
                 return rb.setMsg(resultBean.getMsg());
@@ -684,7 +685,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         ResultBean<List<ActualGetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        bv.setModelId(ProcDefEnum.BASEVEHICLEACTUALSALES.getProDefId());
+        BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
+//        bv.setModelId(ProcDefEnum.BASEVEHICLEACTUALSALES.getProDefId());
+        bv.setModelId(baseVehicleActualSales.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<ActualGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ActualGetNodeVo.class)).collect(Collectors.toList());
@@ -701,7 +704,9 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         ResultBean<List<ActualGetNodeVo>> rb = ResultBean.fireFail();
         BusinessVariables bv = new BusinessVariables();
         BeanUtil.copyProperties(query, bv);
-        bv.setModelId(ProcDefEnum.BASEVEHICLEACTUALSALES.getProDefId());
+//        bv.setModelId(ProcDefEnum.BASEVEHICLEACTUALSALES.getProDefId());
+        BaseVehicleActualSales baseVehicleActualSales = fetchBySid(query.getBusinessSid());
+        bv.setModelId(baseVehicleActualSales.getProcDefId());
         ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
         //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
         List<ActualGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), ActualGetNodeVo.class)).collect(Collectors.toList());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -20,7 +20,8 @@ public enum ProcDefEnum {
     ARREARSCARRYVEHICLE("欠款提车审批流程", "process_f2dkbvny:4:1865016"),
     VEHICLEAPPLY("排产申请流程", "process_9egcg169:14:3120004"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:9:1865007"),
-    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
+//    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
+    BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
     FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
     FINPAYAPPLY("付款申请", "process_gin2tntb:4:725020"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),