From a8e730e96cd3364f3601ca111f4e4e1a5b493540 Mon Sep 17 00:00:00 2001 From: djz8236 Date: Sat, 13 May 2023 17:49:58 +0800 Subject: [PATCH] =?UTF-8?q?flowable=E9=9B=86=E6=88=90=E5=AE=8C=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E8=B4=AD=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasingrequisition/PrVariables.java | 62 +++++++++++++++++++ .../PurchasingRequisitionFeign.java | 4 +- .../PurchasingRequisitionFeignFallback.java | 2 +- 3 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java new file mode 100644 index 00000000..8ae5e11b --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PrVariables.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.system.purchasingrequisition; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.HashMap; +import java.util.Map; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class PrVariables { + /** + * 分公司sid + */ + public static final String ORGPATH="orgPath"; + /** + * 流程定义的id + */ + private String modelId; + /** + * 审批意见 + */ + private String comment; + /** + * 流程实例的id + */ + private String instanceId; + /** + * taskId + */ + private String taskId; + /** + * 当前用户的id + */ + private String userSid; + /** + * 当前用户部门的全路径 + */ + private String orgSidPath; + /** + * 业务sid + */ + private String businessSid; + /** + * 环节定义的ID + */ + private String taskDefKey; + /** + * nextNodeUserSids 下一环节的用户sid + */ + private String nextNodeUserSids; + /** + * 业务参数，按需传递 + */ + private Map formVariables =new HashMap<>(); + /* @ApiModelProperty("机构sid:切换结构使用") + private String orgPath;*/ +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java index 57f07b16..f8a306bc 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeign.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.supervise.system.purchasingrequisition; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -90,7 +89,8 @@ public interface PurchasingRequisitionFeign { @ApiOperation(value = "办理（同意）") @PostMapping("/complete") @ResponseBody - public ResultBean complete(@Valid @RequestBody BusinessVariables query); + public ResultBean complete(@Valid @RequestBody PrVariables query); + @ApiOperation(value = "获取上一个环节") @GetMapping(value = "/getPreviousNodesForReject") @ResponseBody diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java index 27783a51..324a9239 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/purchasingrequisition/PurchasingRequisitionFeignFallback.java @@ -79,7 +79,7 @@ public class PurchasingRequisitionFeignFallback implements PurchasingRequisition } @Override - public ResultBean complete(BusinessVariables query) { + public ResultBean complete(PrVariables query) { return null; }