付款申请流程相关接口定义

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/fincostapply/flow/SubmitFinCostDto.java

@@ -2,12 +2,14 @@ package com.yxt.anrui.fin.api.fincostapply.flow;
 
 import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * @Author dimengzhe
  * @Date 2022/7/4 15:27
  * @Description
  */
+@Data
 public class SubmitFinCostDto implements Dto {
     private static final long serialVersionUID = -7652070660634157511L;
 

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeign.java

@@ -25,15 +25,18 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapply;
 
+import com.yxt.anrui.fin.api.finpaymentapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * Project: anrui-fin(财务) <br/>
@@ -48,7 +51,7 @@ import javax.validation.Valid;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "fin_paymentapply")
+@Api(tags = "付款申请")
 @FeignClient(
         contextId = "anrui-fin-FinPaymentapply",
         name = "anrui-fin",
@@ -75,4 +78,36 @@ public interface FinPaymentapplyFeign {
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<FinPaymentapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /***************************流程相关******************************/
+
+    @ApiOperation("提交付款申请审批流程")
+    @PostMapping("/submitVehicleApply")
+    public ResultBean submitVehicleApply(@Valid @RequestBody SubmitFinPayDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody FinPayCompleteDto dto);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<FinPayGetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap FinPayGetNodeQuery query);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<FinPayGetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap FinPayGetNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody FinPayTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody FinPayTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody FinPayTaskQuery query);
+
+
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyFeignFallback.java

@@ -25,11 +25,14 @@
  *********************************************************/
 package com.yxt.anrui.fin.api.finpaymentapply;
 
+import com.yxt.anrui.fin.api.finpaymentapply.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 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-fin(财务) <br/>
  * File: FinPaymentapplyFeignFallback.java <br/>
@@ -67,4 +70,39 @@ public class FinPaymentapplyFeignFallback implements FinPaymentapplyFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-fin/finpaymentapply/fetchDetailsBySid无法访问");
     }
+
+    @Override
+    public ResultBean submitVehicleApply(SubmitFinPayDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(FinPayCompleteDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<FinPayGetNodeVo>> getPreviousNodesForReject(FinPayGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<FinPayGetNodeVo>> getNextNodesForSubmit(FinPayGetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(FinPayTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(FinPayTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(FinPayTaskQuery query) {
+        return null;
+    }
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayCompleteDto.java

@@ -0,0 +1,42 @@
+package com.yxt.anrui.fin.api.finpaymentapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/4 16:08
+ * @Description
+ */
+@Data
+public class FinPayCompleteDto implements Dto {
+    private static final long serialVersionUID = -699176272753718253L;
+
+    @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;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.fin.api.finpaymentapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/4 16:08
+ * @Description
+ */
+@Data
+public class FinPayGetNodeQuery implements Query {
+    private static final long serialVersionUID = -9047125733441286349L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？")
+    private Map<String, Object> formVariables;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayGetNodeVo.java

@@ -0,0 +1,26 @@
+package com.yxt.anrui.fin.api.finpaymentapply.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/4 16:10
+ * @Description
+ */
+@Data
+public class FinPayGetNodeVo implements Vo {
+    private static final long serialVersionUID = -7308116264117355296L;
+
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/FinPayTaskQuery.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.fin.api.finpaymentapply.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/4 16:11
+ * @Description
+ */
+@Data
+public class FinPayTaskQuery implements Query {
+    private static final long serialVersionUID = 803782559715479654L;
+
+    /**
+     * 终止、驳回、撤回
+     */
+    @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;
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/flow/SubmitFinPayDto.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.fin.api.finpaymentapply.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/4 16:11
+ * @Description
+ */
+@Data
+public class SubmitFinPayDto implements Dto {
+    private static final long serialVersionUID = 3279531849930468266L;
+
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyRest.java

@@ -25,7 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.fin.biz.finpaymentapply;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.fin.api.finpaymentapply.*;
+import com.yxt.anrui.fin.api.finpaymentapply.flow.*;
+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;
@@ -34,6 +38,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyFeignFallback.java <br/>
@@ -47,7 +53,7 @@ import org.springframework.web.bind.annotation.*;
  * @version 1.0
  * @since 1.0
  */
-@Api(tags = "fin_paymentapply")
+@Api(tags = "付款申请")
 @RestController("com.yxt.anrui.fin.biz.finpaymentapply.FinPaymentapplyRest")
 @RequestMapping("v1/finpaymentapply")
 public class FinPaymentapplyRest implements FinPaymentapplyFeign {
@@ -93,4 +99,42 @@ public class FinPaymentapplyRest implements FinPaymentapplyFeign {
         FinPaymentapplyDetailsVo vo = finPaymentapplyService.fetchDetailsVoBySid(sid);
         return rb.success().setData(vo);
     }
+
+    @Override
+    public ResultBean submitVehicleApply(SubmitFinPayDto dto) {
+        return finPaymentapplyService.submitVehicleApply(dto);
+    }
+
+    @Override
+    public ResultBean complete(FinPayCompleteDto dto) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(dto, bv);
+        bv.setModelId(ProcDefEnum.FINPAYAPPLY.getProDefId());
+        return finPaymentapplyService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<FinPayGetNodeVo>> getPreviousNodesForReject(FinPayGetNodeQuery query) {
+        return finPaymentapplyService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean<List<FinPayGetNodeVo>> getNextNodesForSubmit(FinPayGetNodeQuery query) {
+        return finPaymentapplyService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean taskReject(FinPayTaskQuery query) {
+        return finPaymentapplyService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(FinPayTaskQuery query) {
+        return finPaymentapplyService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(FinPayTaskQuery query) {
+        return finPaymentapplyService.breakProcess(query);
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -29,6 +29,11 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.fin.api.finpaymentapply.*;
+import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeQuery;
+import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayGetNodeVo;
+import com.yxt.anrui.fin.api.finpaymentapply.flow.FinPayTaskQuery;
+import com.yxt.anrui.fin.api.finpaymentapply.flow.SubmitFinPayDto;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -37,6 +42,8 @@ import com.yxt.common.core.vo.PagerVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * Project: anrui-fin(财务) <br/>
  * File: FinPaymentapplyService.java <br/>
@@ -116,4 +123,74 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
         BeanUtil.copyProperties(entity, vo);
         return vo;
     }
+
+    /**
+     * 付款申请提交
+     *
+     * @param dto
+     * @return
+     */
+    public ResultBean submitVehicleApply(SubmitFinPayDto dto) {
+        return null;
+    }
+
+    /**
+     * 办理
+     *
+     * @param bv
+     * @return
+     */
+    public ResultBean complete(BusinessVariables bv) {
+        return null;
+    }
+
+    /**
+     * 获取上一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<FinPayGetNodeVo>> getPreviousNodesForReject(FinPayGetNodeQuery query) {
+        return null;
+    }
+
+    /**
+     * 获取下一环节
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean<List<FinPayGetNodeVo>> getNextNodesForSubmit(FinPayGetNodeQuery query) {
+        return null;
+    }
+
+    /**
+     * 驳回
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean taskReject(FinPayTaskQuery query) {
+        return null;
+    }
+
+    /**
+     * 撤回流程
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean revokeProcess(FinPayTaskQuery query) {
+        return null;
+    }
+
+    /**
+     * 终止流程
+     *
+     * @param query
+     * @return
+     */
+    public ResultBean breakProcess(FinPayTaskQuery query) {
+        return null;
+    }
 }

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

@@ -24,7 +24,8 @@ public enum ProcDefEnum {
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:4:280243"),
     BASEINTERNALPURCHASE("内购申请", "process_i6luw5xq:1:267504"),
     SCMCARTRANSFER("库存地点变更申请", "process_3bc4p2em:1:270004"), //TODO
-    FINCOSTAPPLY("费用申请","")
+    FINCOSTAPPLY("费用申请",""),
+    FINPAYAPPLY("付款申请","")
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {