diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java
index b8bccc7992..c9646258de 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredQuery.java
@@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredQuery.java <br/>
@@ -57,5 +59,9 @@ public class BusDeliveredQuery implements Query {
     private String name;
     @ApiModelProperty("车架号")
     private String vinNo;
+    @ApiModelProperty("用户sid")
+    private String userSid;
+    @ApiModelProperty("车架号集合")
+    private List<String> vinNoList;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java
index 577e4ef379..3a8c8379e8 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeExamineQuery.java
@@ -13,7 +13,7 @@ import lombok.Data;
 public class BusDeExamineQuery implements Query {
 
     private static final long serialVersionUID = 5271092843692527206L;
-    @ApiModelProperty(value = "3通过，4不通过")
+    @ApiModelProperty(value = "3通过，4不通过，5驳回")
     private int state;
     private String sid;
     private String reason;
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
index 4e603f430f..94adbc0c51 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApply.java
@@ -70,5 +70,18 @@ public class BusDeliveredApply extends BaseEntity {
     private String applySid;
     @ApiModelProperty(value = "申请人分公司sid")
     private String orgSid;
+    @ApiModelProperty(value = "客户手机号")
+    private String mobile;
+
+    @ApiModelProperty(value = "节点状态")
+    private String nodeState;
+    @ApiModelProperty(value = "节点id")
+    private String nodeId;
+    @ApiModelProperty(value = "流程id")
+    private String procDefId;
+    @ApiModelProperty(value = "实例id")
+    private String procInstId;
+    @ApiModelProperty(value = "任务id")
+    private String taskId;
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyCompleteDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyCompleteDto.java
new file mode 100644
index 0000000000..ef9074b3d9
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyCompleteDto.java
@@ -0,0 +1,37 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+@Data
+public class BusDeliveredApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = -5378867808055103417L;
+
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
+    private Map<String, Object> formVariables;
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java
index 70ad7cc693..cdc745074d 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDetailVo.java
@@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -58,11 +59,13 @@ public class BusDeliveredApplyDetailVo implements Vo {
     private String applyDate;
     @ApiModelProperty("客户名称")
     private String name;
+    @ApiModelProperty(value = "客户手机号")
+    private String mobile;
     @ApiModelProperty("车型别名")
     private String modelName;
     @ApiModelProperty("是否是终端:1是，0不是")
     private Integer isTerminal;
     @ApiModelProperty(value = "出库申请车辆信息")
-    private List<BusDeliveredApplyDetailsVo> listVo;
+    private List<BusDeliveredApplyDetailsVo> listVo = new ArrayList<>();
 
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java
index 7c03443caa..9860df8897 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyDto.java
@@ -26,12 +26,14 @@
 package com.yxt.anrui.buscenter.api.busdeliveredapply;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDetailsDto;
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,12 +56,16 @@ public class BusDeliveredApplyDto implements Dto {
     private static final long serialVersionUID = 2682848430658294059L;
     @ApiModelProperty(value = "出库申请sid")
     private String sid;
+    private String userSid;
     @ApiModelProperty("合同编号")
     private String contractNo;
     @ApiModelProperty(value = "申请人")
     private String applyName;
     @ApiModelProperty(value = "申请人sid")
     private String applySid;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @ApiModelProperty("申请日期")
+    private Date applyDate; // 申请日期
     @ApiModelProperty("客户名称")
     private String name;
     @ApiModelProperty("车型别名")
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
index e3a0b0e6a1..31e28fba13 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
@@ -33,6 +33,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyFeign.java <br/>
@@ -102,6 +105,17 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     ResultBean submitBySid(@RequestParam(value = "sid") String sid);
 
+    /**
+     * 列表上的撤回
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
+    @ApiOperation("列表上的撤回")
+    @PutMapping("/revokeBySid")
+    @ResponseBody
+    ResultBean revokeBySid(@RequestParam(value = "sid") String sid);
+
     /**
      * 编辑初始化/详情
      *
@@ -128,4 +142,38 @@ public interface BusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(@RequestBody PagerQuery<BusDeliveredExamineQuery> pq);
 
+    @ApiOperation("提交车库移库审批流程")
+    @PostMapping("/submitDeliveredApply")
+    @ResponseBody
+    public ResultBean submitDeliveredApply(@Valid @RequestBody SubmitDeliveredApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    @ResponseBody
+    public ResultBean complete(@Valid @RequestBody BusDeliveredApplyCompleteDto query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @PostMapping(value = "/getPreviousNodesForReject")
+    @ResponseBody
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @RequestBody GetNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @PostMapping(value = "/getNextNodesForSubmit")
+    @ResponseBody
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    @ResponseBody
+    public ResultBean taskReject(@Valid @RequestBody BusDeliveredApplyTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    @ResponseBody
+    public ResultBean revokeProcess(@Valid @RequestBody BusDeliveredApplyTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    @ResponseBody
+    public ResultBean breakProcess(@Valid @RequestBody BusDeliveredApplyTaskQuery query);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
index 25edd78af8..70c2fa60a2 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
@@ -30,6 +30,8 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyFeignFallback.java <br/>
@@ -72,6 +74,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
         return null;
     }
 
+    @Override
+    public ResultBean revokeBySid(String sid) {
+        return null;
+    }
+
     @Override
     public ResultBean<BusDeliveredApplyDetailVo> fetchDetailsBySid(BusDeliveredApplyDetailQuery query) {
         ResultBean rb = ResultBean.fireFail();
@@ -92,4 +99,39 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign {
     public ResultBean<PagerVo<BusDeliveredApplyVo>> listExaminePage(PagerQuery<BusDeliveredExamineQuery> pq) {
         return null;
     }
+
+    @Override
+    public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(BusDeliveredApplyCompleteDto query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(BusDeliveredApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(BusDeliveredApplyTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(BusDeliveredApplyTaskQuery query) {
+        return null;
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyTaskQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyTaskQuery.java
new file mode 100644
index 0000000000..34239cf59a
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyTaskQuery.java
@@ -0,0 +1,53 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class BusDeliveredApplyTaskQuery implements Query {
+    private static final long serialVersionUID = 2262976432174683738L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回、驳回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+
+    @ApiModelProperty("节点")
+    private String targetKey;
+
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
index d58b548074..f02096c911 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java
@@ -60,6 +60,8 @@ public class BusDeliveredApplyVo implements Vo {
     private String applyDate;
     @ApiModelProperty(value = "申请人")
     private String applyName;
+    @ApiModelProperty(value = "显示撤回按钮")
+    private boolean revokeState;
 
 
 }
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeQuery.java
new file mode 100644
index 0000000000..7ec58b00a0
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeQuery.java
@@ -0,0 +1,21 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+@Data
+public class GetNodeQuery implements Query {
+
+    private static final long serialVersionUID = 1193998153281794455L;
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "分支字段及业务字段")
+    private Map<String, Object> formVariables;
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeVo.java
new file mode 100644
index 0000000000..0c61f95093
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/GetNodeVo.java
@@ -0,0 +1,22 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GetNodeVo implements Vo {
+
+    private static final long serialVersionUID = 2363224219340406546L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitDeliveredApplyDto.java
new file mode 100644
index 0000000000..f9caea2a2c
--- /dev/null
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/SubmitDeliveredApplyDto.java
@@ -0,0 +1,17 @@
+package com.yxt.anrui.buscenter.api.busdeliveredapply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SubmitDeliveredApplyDto extends BusDeliveredApplyDto {
+
+    private static final long serialVersionUID = 452003563735204012L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+}
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java
index 557c4118df..b5b9a864ca 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapplydetails/BusDeliveredApplyDetailsDto.java
@@ -56,6 +56,8 @@ public class BusDeliveredApplyDetailsDto implements Dto {
     private String price;
     @ApiModelProperty(value = "备注")
     private String remarks;
+    @ApiModelProperty(value = "联系电话")
+    private String mobile;
     @ApiModelProperty(value = "使用人信息")
     private BusDeliveredUseMessageDto useMessage;
 
diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeign.java
index a47c7d8e2d..befe59df8a 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeign.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredusemessage/BusDeliveredUseMessageFeign.java
@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.busdeliveredusemessage;
 
+import com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
index 961f4732ed..869d1537ca 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdelivered/BusDeliveredService.java
@@ -73,6 +73,14 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bd.vinNo", query.getVinNo());
             }
+            //车架号集合
+            if (query.getVinNoList().size() > 0) {
+                qw.notIn("bd.vinNo", query.getVinNoList());
+            }
+            //用户sid
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("bd.createBySid", query.getUserSid());
+            }
             //待出库：1，出库申请：0
             qw.eq("bd.state", 1);
 
@@ -127,6 +135,6 @@ public class BusDeliveredService extends MybatisBaseService<BusDeliveredMapper,
     }
 
     public int updateState(String vinNo, int i) {
-        return baseMapper.updateState(vinNo,i);
+        return baseMapper.updateState(vinNo, i);
     }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
index bea8a9e33b..568fea5c5b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.java
@@ -36,6 +36,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -86,4 +87,6 @@ public interface BusDeliveredApplyMapper extends BaseMapper<BusDeliveredApply> {
      * @return
      */
     int updateState(@Param("sid") String sid, @Param("state") int state);
+
+    int updateFlowFiled(Map<String, Object> map);
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
index 636a751c47..8cf114cb59 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
@@ -5,15 +5,16 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdeliveredapply.BusDeliveredApplyVo">
         SELECT bd.sid,
-               case bd.state
-                   when 1 then '待提交'
-                   when 2 then '待审核'
-                   when 3 then '已通过'
-                   when 4 then '未通过' end          as state,
-               bd.contractNo,
-               bd.name,
-               DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate,
-               bd.applyName
+        case bd.state
+        when 1 then '待提交'
+        when 2 then '待审核'
+        when 3 then '已通过'
+        when 4 then '未通过' end as state,
+        if(bd.state = 2, true,false) as revokeState,
+        bd.contractNo,
+        bd.name,
+        DATE_FORMAT(bd.applyDate, '%Y-%m-%d') as applyDate,
+        bd.applyName
         FROM bus_delivered_apply bd
         <where>
             ${ew.sqlSegment}
@@ -47,4 +48,20 @@
         set state = #{state}
         where sid = #{sid}
     </update>
+
+    <update id="updateFlowFiled">
+        UPDATE bus_delivered_apply
+        SET nodeState=#{nodeState}
+        , nodeId=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid = #{sid}
+    </update>
 </mapper>
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
index 55b759df52..d967b6bb57 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
@@ -25,7 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+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;
@@ -37,6 +40,8 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDeliveredApplyFeignFallback.java <br/>
@@ -111,6 +116,18 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         return busDeliveredApplyService.submitBySid(sid);
     }
 
+    /**
+     * 出库申请管理列表的撤回
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
+    @Override
+    public ResultBean revokeBySid(String sid) {
+        return busDeliveredApplyService.revokeBySid(sid);
+    }
+
+
     /**
      * 初始化/详情
      *
@@ -144,4 +161,42 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
         PagerVo<BusDeliveredApplyVo> pv = busDeliveredApplyService.listExaminePage(pq);
         return rb.success().setData(pv);
     }
+
+    @Override
+    public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
+        return busDeliveredApplyService.submitDeliveredApply(dto);
+    }
+
+    @Override
+    public ResultBean complete(BusDeliveredApplyCompleteDto query) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
+        return busDeliveredApplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        return busDeliveredApplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        return busDeliveredApplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean taskReject(BusDeliveredApplyTaskQuery query) {
+        return busDeliveredApplyService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(BusDeliveredApplyTaskQuery query) {
+        return busDeliveredApplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(BusDeliveredApplyTaskQuery query) {
+        return busDeliveredApplyService.breakProcess(query);
+    }
 }
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
index cec007863e..bacd510359 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
@@ -27,6 +27,7 @@ package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
@@ -37,7 +38,18 @@ import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessage
 import com.yxt.anrui.buscenter.biz.busdelivered.BusDeliveredService;
 import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDetailsService;
 import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
+import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -48,8 +60,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -76,6 +87,14 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private BusDeliveredService busDeliveredService;
+    @Autowired
+    private CrmCustomerTempFeign crmCustomerTempFeign;
+    @Autowired
+    private FlowableFeign flowableFeign;
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+    @Autowired
+    SysUserFeign sysUserFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -126,6 +145,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if (StringUtils.isBlank(dtoSid)) {
             //新增
             BusDeliveredApply busDeliveredApply = new BusDeliveredApply();
+            String mobile = dto.getDetailsList().get(0).getUseMessage().getMobile();
+            busDeliveredApply.setMobile(mobile);
             BeanUtil.copyProperties(dto, busDeliveredApply, "sid");
             List<BusDeliveredApplyDetailsDto> dtoList = dto.getDetailsList();
             if (dtoList.size() > 0) {
@@ -155,7 +176,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(dtoSid);
         for (int i = 0; i < stringList.size(); i++) {
             String vinNo = stringList.get(i);
-            busDeliveredService.updateState(vinNo, 1);
+            busDeliveredService.updateState(vinNo, 0);
         }
         return rb.success().setData(dtoSid);
     }
@@ -178,15 +199,36 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         BeanUtil.copyProperties(entity, vo);
         String format = DateUtil.format(entity.getApplyDate(), "yyyy-MM-dd");
         vo.setApplyDate(format);
-        //根据出库申请单的sid查询需要出库的车辆信息
-        List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
-        for (int i = 0; i < voList.size(); i++) {
-            BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
-            BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo();
-            BeanUtil.copyProperties(busDeliveredUseMessage, busDeliveredUseMessageVo);
-            voList.get(i).setUseMessage(busDeliveredUseMessageVo);
-        }
-        vo.setListVo(voList);
+        if (vo.getIsTerminal().equals(1)) {
+            List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
+            voList.removeAll(Collections.singleton(null));
+            if (!voList.isEmpty()) {
+                for (BusDeliveredApplyDetailsVo v : voList) {
+                    CrmCustomerTempVo data = crmCustomerTempFeign.selByMobile(vo.getMobile()).getData();
+                    BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo();
+                    busDeliveredUseMessageVo.setMobile(data.getMobile());
+                    busDeliveredUseMessageVo.setName(data.getName());
+                    busDeliveredUseMessageVo.setAddress(data.getAddress());
+                    busDeliveredUseMessageVo.setIdNo(data.getIDNumber());
+                    busDeliveredUseMessageVo.setVinNo(voList.get(0).getVinNo());
+                    busDeliveredUseMessageVo.setContractNo(vo.getContractNo());
+                    v.setUseMessage(busDeliveredUseMessageVo);
+                }
+            }
+            vo.setListVo(voList);
+
+        } else if (vo.getIsTerminal().equals(0)) {
+            //根据出库申请单的sid查询需要出库的车辆信息
+            List<BusDeliveredApplyDetailsVo> voList = busDeliveredApplyDetailsService.detailsList(sid);
+            for (int i = 0; i < voList.size(); i++) {
+                BusDeliveredUseMessage busDeliveredUseMessage = busDeliveredUseMessageService.fetchBySid(voList.get(i).getUseMessageSid());
+                BusDeliveredUseMessageVo busDeliveredUseMessageVo = new BusDeliveredUseMessageVo();
+                BeanUtil.copyProperties(busDeliveredUseMessage, busDeliveredUseMessageVo);
+                voList.get(i).setUseMessage(busDeliveredUseMessageVo);
+            }
+            vo.setListVo(voList);
+        }
+
         return rb.success().setData(vo);
     }
 
@@ -226,6 +268,26 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success().setMsg("提交成功");
     }
 
+    /**
+     * 出库申请管理列表的撤回
+     *
+     * @param sid 出库申请sid
+     * @return
+     */
+    public ResultBean revokeBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = fetchBySid(sid);
+        if (busDeliveredApply == null) {
+            return rb.setMsg("该出库申请不存在");
+        }
+        //状态：1待提交，2待审核，3已通过，4未通过
+        if (!busDeliveredApply.getState().equals(2)) {
+            return rb.setMsg("撤回失败,该申请已在审核中");
+        }
+        baseMapper.updateStateBySid(1, sid, DateUtil.date());
+        return rb.success().setMsg("撤回成功");
+    }
+
     /**
      * 删除
      *
@@ -240,6 +302,13 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         if (stateList.contains(false)) {
             return rb.setMsg("已提交的申请不允许删除");
         }
+        for (String s : sidsList) {
+            List<String> stringList = busDeliveredApplyDetailsService.selectVinByApplySid(s);
+            for (int j = 0; j < stringList.size(); j++) {
+                String vinNo = stringList.get(j);
+                busDeliveredService.updateState(vinNo, 1);
+            }
+        }
         if (sidsList.size() > 0) {
             for (int i = 0; i < sidsList.size(); i++) {
                 busDeliveredApplyDetailsService.deleteByApplySid(sidsList.get(i));
@@ -317,6 +386,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             }
             //台账的设置出库
 
+        } else if (state == 5) {
+            if (StringUtils.isBlank(busDeExamineQuery.getReason())) {
+                return rb.setMsg("请输入驳回的原因");
+            }
+            baseMapper.updateStateAndReason(busDeExamineQuery.getSid(), 1, busDeExamineQuery.getReason());
+
         } else {
             baseMapper.updateState(busDeExamineQuery.getSid(), state);
         }
@@ -340,4 +415,261 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         }
         return rb.success();
     }
+
+    /**
+     * 提交审批流程
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submitDeliveredApply(SubmitDeliveredApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据用户sid获取staffSid
+        ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+        if (!userVoResultBean.getSuccess()) {
+            return rb.setMsg(userVoResultBean.getMsg());
+        }
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+        if (!staffOrgResultBean.getSuccess()) {
+            return rb.setMsg(staffOrgResultBean.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+        BusDeliveredApply busDeliveredApply = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, busDeliveredApply);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        //新增修改保存
+        ResultBean<String> resultBean = saveOrUpdateDto(dto);
+        if (!resultBean.getSuccess()) {
+            return rb.setMsg(resultBean.getMsg());
+        }
+        String businessSid = resultBean.getData();
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getUserSid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(busDeliveredApply.getTaskId());
+            bv.setTaskDefKey(busDeliveredApply.getNodeId());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 更新流程相关的状态
+     *
+     * @param map
+     * @return
+     */
+    private int updateFlowFiled(Map<String, Object> map) {
+        return baseMapper.updateFlowFiled(map);
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitDeliveredApplyDto dto, BusDeliveredApply busDeliveredApply) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (busDeliveredApply != null) {
+                String businessTaskId = busDeliveredApply.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    /**
+     * 办理
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = fetchBySid(bv.getBusinessSid());
+        if (bv.getTaskId().equals(busDeliveredApply.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+
+    }
+
+    /**
+     * 获取上一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = new ResultBean<>();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
+        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());
+        return rb.success().setData(voList);
+    }
+
+    /**
+     * 获取下一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId());
+        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());
+        return rb.success().setData(voList);
+    }
+
+    /**
+     * 驳回任务
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean taskReject(BusDeliveredApplyTaskQuery query) {
+
+        ResultBean rb = ResultBean.fireFail();
+        BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
+        if (busDeliveredApply == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = busDeliveredApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+
+    }
+
+    /**
+     * 撤回
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean revokeProcess(BusDeliveredApplyTaskQuery query) {
+
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询移库申请
+        BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = busDeliveredApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg("操作失败!");
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+
+    }
+
+    /**
+     * 终止流程
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean breakProcess(BusDeliveredApplyTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        BusDeliveredApply busDeliveredApply = fetchBySid(query.getBusinessSid());
+        String businessTaskId = busDeliveredApply.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
 }
\ No newline at end of file
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java
index b084f291d7..330d3c54ca 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredusemessage/BusDeliveredUseMessageRest.java
@@ -25,10 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.busdeliveredusemessage;
 
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageDetailsVo;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageFeign;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageQuery;
-import com.yxt.anrui.buscenter.api.busdeliveredusemessage.BusDeliveredUseMessageVo;
+import com.yxt.anrui.buscenter.api.busdeliveredusemessage.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
index b62bc2097a..b3757b85f1 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeign.java
@@ -52,6 +52,11 @@ public interface CrmCustomerTempFeign {
     @GetMapping("/list")
     public ResultBean<List<CrmCustomerTempVo>> list();
 
+    @ApiOperation("根据手机号查询数据")
+    @ResponseBody
+    @GetMapping("/selByMobile/{mobile}")
+    public ResultBean<CrmCustomerTempVo> selByMobile(@PathVariable("mobile") String mobile);
+
     /**
      * pc端潜在客户新增保存
      *
diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
index 6fbef05041..7ba662045f 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempFeignFallback.java
@@ -43,6 +43,11 @@ public class CrmCustomerTempFeignFallback implements CrmCustomerTempFeign {
 		return rb.setMsg("接口anrui-crm/crmcustomertemp/list无法访问");
 	}
 
+	@Override
+	public ResultBean<CrmCustomerTempVo> selByMobile(String mobile) {
+		return null;
+	}
+
 	@Override
 	public ResultBean save(CrmCustomerTempDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-crm/crmcustomertemp/save无法访问");
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
index 073cd9ab39..963ad24b53 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java
@@ -112,8 +112,10 @@ public interface CrmCustomerTempMapper extends BaseMapper<CrmCustomerTemp> {
      */
     AppCrmCustomerTempInfoVo getAppCustomerTempDetailsBySid(@Param("sid") String sid);
 
-    int  selBySidAndMobile(@Param("sid") String sid, @Param("mobile") String mobile);
+    int selBySidAndMobile(@Param("sid") String sid, @Param("mobile") String mobile);
 
-    int selBySidAndWeixin( @Param("sid")String sid, @Param("weixin") String weixin);
+    int selBySidAndWeixin(@Param("sid") String sid, @Param("weixin") String weixin);
+
+    CrmCustomerTempVo selByMobile(@Param("mobile") String mobile);
 
 }
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index f882435694..2fc3dc7661 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -200,4 +200,9 @@
         WHERE cct.sid != #{sid}
           AND cct.weixin = #{weixin}
     </select>
+    <select id="selByMobile" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo">
+        SELECT *
+        FROM crm_customer_temp
+        WHERE mobile = #{mobile}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
index ec75961420..6fc4a03b54 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempRest.java
@@ -75,6 +75,13 @@ public class CrmCustomerTempRest implements CrmCustomerTempFeign {
         return rb.success().setData(list);
     }
 
+    @Override
+    public ResultBean<CrmCustomerTempVo> selByMobile(String mobile) {
+        ResultBean rb = ResultBean.fireFail();
+        CrmCustomerTempVo vo = crmCustomerTempService.selByMobile(mobile);
+        return rb.success().setData(vo);
+    }
+
     /**
      * 潜在客户新增保存
      *
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 158dbf2d4c..f57897238d 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -845,4 +845,8 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         vo.setCrmVisitFileList(list);
         return vo;
     }
+
+    public CrmCustomerTempVo selByMobile(String mobile) {
+        return baseMapper.selByMobile(mobile);
+    }
 }
\ No newline at end of file
diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index 2e02efd082..5da99b4c71 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -25,7 +25,9 @@ public enum ProcDefEnum {
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:2:315150"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:4:300008"), //TODO
     FINCOSTAPPLY("费用申请","process_u0pahv0s:4:320016"),
-    FINPAYAPPLY("付款申请","process_gin2tntb:2:320012")
+    FINPAYAPPLY("付款申请","process_gin2tntb:2:320012"),
+    BUSDELIVEREDAPPLY("付款申请","process_wgt1n66l:2:355058")
+
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {