车辆外采流程办理

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowDto.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.flowable.api.flow;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel("工作流数据")
+@Data
+public class FlowDto {
+
+    @ApiModelProperty("业务sid")
+    private String businessSid;
+
+    @ApiModelProperty("意见")
+    private String comment;
+
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+    @ApiModelProperty("流程定义id")
+    private String modelId;
+    @ApiModelProperty("下一环节的代办人sid")
+    private String nextNodeUserSids;
+}

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFallback.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.flowable.api.flow;
 
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Component;
@@ -33,5 +34,41 @@ public class FlowableFallback implements FlowableFeign {
         return null;
     }
 
+    @Override
+    public ResultBean getNextNodeUserSidsOfCreate(Map<String, Object> variables ) {
+        return null;
+    }
+
+    @Override
+    public ResultBean getNextNodeUserSidsOfSubmit(Map<String, Object> variables ) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<UpdateFlowFieldVo> startProcess(StartProcessDto dto) {
+        return null;
+    }
+
+
+    @Override
+    public ResultBean handleProsess(BusinessVariables bv) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl ) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl) {
+        return null;
+    }
+
 
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/FlowableFeign.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.flowable.api.flow;
 
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
@@ -73,4 +74,48 @@ public interface FlowableFeign {
     @DeleteMapping(value = "/task/deleteProcess/{procInsId}")
     @ResponseBody
     ResultBean deleteProcess(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    /**
+     * 创建流程实例时取下一环节的用户sid
+     *
+     * @return
+     */
+    @ApiOperation(value = "创建流程实例时取下一环节的用户sid")
+    @PostMapping(value = "/getNextNodeUserSidsOfCreate")
+    @ResponseBody
+    ResultBean<String> getNextNodeUserSidsOfCreate( @RequestBody Map<String, Object>  variables);
+    /**
+     * 提交流程实例时取下一环节的用户sid
+     *
+     * @return
+     */
+    @ApiOperation(value = "提交流程实例时取下一环节的用户sid")
+    @PostMapping(value = "/getNextNodeUserSidsOfSubmit")
+    @ResponseBody
+    ResultBean getNextNodeUserSidsOfSubmit(@RequestBody Map<String, Object>  variables);
+
+    @ApiOperation(value = "启动流程")
+    @PostMapping(value = "/startProcess")
+    @ResponseBody
+    ResultBean<UpdateFlowFieldVo> startProcess(@RequestBody StartProcessDto dto);
+
+    @ApiOperation(value = "处理流程")
+    @PostMapping(value = "/handleProsess")
+    @ResponseBody
+    ResultBean handleProsess(@RequestBody BusinessVariables bv);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    @ResponseBody
+    ResultBean revokeProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
+
+    @ApiOperation(value = "驳回流程")
+    @PostMapping(value = "/taskReject")
+    @ResponseBody
+    ResultBean taskReject(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
+
+    @ApiOperation(value = "终止流程")
+    @PostMapping(value = "/breakProcess")
+    @ResponseBody
+    ResultBean breakProcess(@RequestBody com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl);
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/StartProcessDto.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.flowable.api.flow;
+
+import java.util.Map;
+
+public class StartProcessDto {
+
+    private String proDefId;
+    private String userSid;
+    private Map<String, Object> variables;
+
+    public String getProDefId() {
+        return proDefId;
+    }
+
+    public void setProDefId(String proDefId) {
+        this.proDefId = proDefId;
+    }
+
+    public String getUserSid() {
+        return userSid;
+    }
+
+    public void setUserSid(String userSid) {
+        this.userSid = userSid;
+    }
+
+    public Map<String, Object> getVariables() {
+        return variables;
+    }
+
+    public void setVariables(Map<String, Object> variables) {
+        this.variables = variables;
+    }
+}

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flow/UpdateFlowFieldVo.java

@@ -0,0 +1,70 @@
+package com.yxt.anrui.flowable.api.flow;
+
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+
+public class UpdateFlowFieldVo {
+
+    private String sid;
+    private String procDefId;
+    private String nodeState;
+    private String procInsId;
+    private String taskDefKey;
+    private String taskId;
+    private String nextNodeUserSids;
+
+    public String getNextNodeUserSids() {
+        return nextNodeUserSids;
+    }
+
+    public void setNextNodeUserSids(String nextNodeUserSids) {
+        this.nextNodeUserSids = nextNodeUserSids;
+    }
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getProcDefId() {
+        return procDefId;
+    }
+
+    public void setProcDefId(String procDefId) {
+        this.procDefId = procDefId;
+    }
+
+    public String getNodeState() {
+        return nodeState;
+    }
+
+    public void setNodeState(String nodeState) {
+        this.nodeState = nodeState;
+    }
+
+    public String getProcInsId() {
+        return procInsId;
+    }
+
+    public void setProcInsId(String procInsId) {
+        this.procInsId = procInsId;
+    }
+
+    public String getTaskDefKey() {
+        return taskDefKey;
+    }
+
+    public void setTaskDefKey(String taskDefKey) {
+        this.taskDefKey = taskDefKey;
+    }
+
+    public String getTaskId() {
+        return taskId;
+    }
+
+    public void setTaskId(String taskId) {
+        this.taskId = taskId;
+    }
+}

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskFeign.java

@@ -6,8 +6,6 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.anrui.flowable.test.StartProcessInstanceQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import feign.Param;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.flowable.bpmn.model.FlowElement;
@@ -165,4 +163,5 @@ public interface FlowTaskFeign {
     @ApiOperation("获取流程图")
     @GetMapping("/readXml/{sid}")
     ResultBean readXml(@PathVariable(value ="sid") String sid);
+
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTaskVo.java

@@ -19,7 +19,8 @@ public class FlowTaskVo {
 
     @ApiModelProperty("任务Id")
     private String taskId;
-
+    @ApiModelProperty("业务sid")
+    private String  businessSid;
     @ApiModelProperty("用户Id")
     private String userId;
     @ApiModelProperty("用户Sid")
@@ -46,4 +47,6 @@ public class FlowTaskVo {
     @ApiModelProperty("审批组")
     private List<String> candidateGroups;
 
+
+
 }

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

@@ -13,13 +13,13 @@ public enum ProcDefEnum {
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
     ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     ARREARSCARRYVEHICLE("欠款提车审批流程", "arrears_carryvehicle:1:232589"),
-    VEHICLEAPPLY("排产申请流程", "process_9egcg169:1:242660"),
-    RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),
+    VEHICLEAPPLY("排产申请流程", "process_9egcg169:1:242660"),//TODO
+    RECORDAPPLICATION("入账申请", "record_application_7y80d4r8:1:265008"),//TODO
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:4:245028"),
     SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064" ),
     BASEVEHICLEACTUALSALES("未售买断", "process_2l9i88sk:3:272604"),//ToDo
     SALESORDER("销售订单审批流程", "process_p5ils2rn:2:245112"),
-    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:2:325008"),
+    BASEOUTSOURCINGAPPLICATION("外采申请", "process_5tqysnjc:6:375342")//TODO
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/sqloperationsymbol/BusinessVariables.java

@@ -15,14 +15,7 @@ import java.util.Map;
 @AllArgsConstructor
 @NoArgsConstructor
 public class BusinessVariables {
-    /**
-     * 业务系统处理任务时 打开办理页面用到的
-     */
-    private String handleUrl;
-    /**
-     * 业务系统查看任务详情时 打开办理页面用到的
-     */
-    private String detailUrl;
+    private String modelId;
     /**
      * 业务参数，按需传递
      */