diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java index 9329d32df6..4d920f290e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; /** * Project: anrui-base(车型调价申请)
@@ -44,6 +45,7 @@ import io.swagger.annotations.ApiModelProperty; * @since 1.0 */ @ApiModel(value = "车型调价申请车型表", description = "车型调价申请车型表") +@Data @TableName("base_model_modprice_model") public class BaseModelModpriceModel extends BaseEntity { private static final long serialVersionUID = 1L; @@ -66,115 +68,13 @@ public class BaseModelModpriceModel extends BaseEntity { @ApiModelProperty("成本价") private String costPrice; // 成本价 + + @ApiModelProperty("现贷款销售指导价") + private String manufactorSettlementPrice; // 现贷款销售指导价 - @ApiModelProperty("现销售指导价") - private String guidedPrice; // 现销售指导价 + @ApiModelProperty("现全款销售指导价") + private String guidedPrice; // 现全款销售指导价 @ApiModelProperty("价格增减数额") private String incOrDecInPrice; // 价格增减数额 - - /** - * @return 车型调价申请sid - */ - public String getMainSid(){ - return mainSid; - } - - /** - * @param mainSid 车型调价申请sid to set - */ - public void setMainSid(String mainSid){ - this.mainSid = mainSid; - } - /** - * @return 车型sid - */ - public String getModelSid(){ - return modelSid; - } - - /** - * @param modelSid 车型sid to set - */ - public void setModelSid(String modelSid){ - this.modelSid = modelSid; - } - /** - * @return 车型别名 - */ - public String getVehicleAlias(){ - return vehicleAlias; - } - - /** - * @param vehicleAlias 车型别名 to set - */ - public void setVehicleAlias(String vehicleAlias){ - this.vehicleAlias = vehicleAlias; - } - /** - * @return 常用配置sid - */ - public String getConfigSid(){ - return configSid; - } - - /** - * @param configSid 常用配置sid to set - */ - public void setConfigSid(String configSid){ - this.configSid = configSid; - } - /** - * @return 常用配置名称 - */ - public String getConfigName(){ - return configName; - } - - /** - * @param configName 常用配置名称 to set - */ - public void setConfigName(String configName){ - this.configName = configName; - } - /** - * @return 成本价 - */ - public String getCostPrice(){ - return costPrice; - } - - /** - * @param costPrice 成本价 to set - */ - public void setCostPrice(String costPrice){ - this.costPrice = costPrice; - } - /** - * @return 现销售指导价 - */ - public String getGuidedPrice(){ - return guidedPrice; - } - - /** - * @param guidedPrice 现销售指导价 to set - */ - public void setGuidedPrice(String guidedPrice){ - this.guidedPrice = guidedPrice; - } - /** - * @return 价格增减数额 - */ - public String getIncOrDecInPrice(){ - return incOrDecInPrice; - } - - /** - * @param incOrDecInPrice 价格增减数额 to set - */ - public void setIncOrDecInPrice(String incOrDecInPrice){ - this.incOrDecInPrice = incOrDecInPrice; - } } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java index f5e76d65a8..d95192be8e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java @@ -61,8 +61,10 @@ public class BaseModelModpriceModelDto implements Dto { private String configName; // 常用配置名称 @ApiModelProperty("成本价") private String costPrice; // 成本价 - @ApiModelProperty("现销售指导价") - private String guidedPrice; // 现销售指导价 + @ApiModelProperty("现贷款销售指导价") + private String manufactorSettlementPrice; // 现贷款销售指导价 + @ApiModelProperty("现全款销售指导价") + private String guidedPrice; // 现全款销售指导价 @ApiModelProperty("价格增减数额") private String incOrDecInPrice; // 价格增减数额 @ApiModelProperty("备注") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java index decb75ab86..7e3de0998f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java @@ -61,8 +61,10 @@ public class BaseModelModpriceModelVo implements Vo { private String configName; // 常用配置名称 @ApiModelProperty("成本价") private String costPrice; // 成本价 - @ApiModelProperty("现销售指导价") - private String guidedPrice; // 现销售指导价 + @ApiModelProperty("现贷款销售指导价") + private String manufactorSettlementPrice; // 现贷款销售指导价 + @ApiModelProperty("现全款销售指导价") + private String guidedPrice; // 现全款销售指导价 @ApiModelProperty("价格增减数额") private String incOrDecInPrice; // 价格增减数额 @ApiModelProperty("备注") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java index c9bfe3aedf..69a2c6f294 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java @@ -90,6 +90,8 @@ public class BaseOutsourcingApplication extends BaseEntity { private String depositBankName; // 车款开户银行 @ApiModelProperty("车款银行账号") private String bankAccount; // 车款银行账号 + @ApiModelProperty("车款收款账户名称") + private String accountName; // 车款收款账户名称 @ApiModelProperty("台数") private Integer num; // 台数 @ApiModelProperty("订金") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java index 9a114c55c8..a50c061889 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java @@ -92,6 +92,8 @@ public class BaseOutsourcingApplicationDetailsVo implements Vo { private String depositBankName; // 车款开户银行 @ApiModelProperty("车款银行账号") private String bankAccount; // 车款银行账号 + @ApiModelProperty("车款收款账户名称") + private String accountName; // 车款收款账户名称 @ApiModelProperty("台数") private Integer num; // 台数 @ApiModelProperty("订金") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java index 5525b168e1..29e4f6a609 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java @@ -100,6 +100,8 @@ public class BaseOutsourcingApplicationDto implements Dto { private String depositBankName; // 车款开户银行 @ApiModelProperty("车款银行账号") private String bankAccount; // 车款银行账号 + @ApiModelProperty("车款收款账户名称") + private String accountName; // 车款收款账户名称 @ApiModelProperty("台数") private Integer num; // 台数 @ApiModelProperty("订金") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java index 8d768439ef..ab37f95a5d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java @@ -13,10 +13,10 @@ import lombok.Data; */ @Data public class BaseVehmodelConfigVos implements Vo { - @ApiModelProperty(value = "销售指导价") + @ApiModelProperty(value = "销售指导价（全款）") @JsonSerialize(using = ToStringSerializer.class) private String guidedPrice; - @ApiModelProperty(value = "厂家结算价") + @ApiModelProperty(value = "销售指导价（贷款）") private String manufactorSettlementPrice; @ApiModelProperty(value = "车型别名") private String vehicleAlias; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java index 5da528785b..82a9341705 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java @@ -99,14 +99,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { if (StringUtils.isNotBlank(dto.getSpecification())) { configName += dto.getSpecification() + "/"; } - //后桥速比 - if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { - configName += dto.getRearAxleRatio() + "/"; - } //后桥 if (StringUtils.isNotBlank(dto.getRearAxleValue())) { configName += dto.getRearAxleValue() + "/"; } + //后桥速比 + if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { + configName += dto.getRearAxleRatio() + "/"; + } //空调 if (StringUtils.isNotBlank(dto.getAirConditioner())) { configName += dto.getAirConditioner() + "/"; @@ -223,14 +223,14 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { if (StringUtils.isNotBlank(dto.getSpecification())) { configName += dto.getSpecification() + "/"; } - //后桥速比 - if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { - configName += dto.getRearAxleRatio() + "/"; - } //后桥 if (StringUtils.isNotBlank(dto.getRearAxleValue())) { configName += dto.getRearAxleValue() + "/"; } + //后桥速比 + if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { + configName += dto.getRearAxleRatio() + "/"; + } //空调 if (StringUtils.isNotBlank(dto.getAirConditioner())) { configName += dto.getAirConditioner() + "/"; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java index 1c7373550c..14bda7bfdf 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigService.java @@ -361,7 +361,7 @@ public class BaseModelConfigService extends MybatisBaseService BaseVehmodelConfig selectSid(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("useOrgSid") String useOrgSid); - @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice} where sid = #{sid}") - void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("sid") String sid); + @Update("update base_vehmodel_config set guidedPrice = #{guidedPrice},manufactorSettlementPrice = #{manufactorSettlementPrice} where sid = #{sid}") + void updateGuidedPrice(@Param("guidedPrice") BigDecimal guidedPrice,@Param("manufactorSettlementPrice") BigDecimal manufactorSettlementPrice,@Param("sid") String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java index 46e739f959..8aad61dab4 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java @@ -398,7 +398,7 @@ public class BaseVehmodelConfigService extends MybatisBaseService fetchDetailsBySid(@PathVariable("sid") String sid); + + /**************************************单车返利预提审批流程*******************************************/ + + @ApiOperation("提交单车返利预提申请") + @PostMapping("/submitVehRebateWithApply") + public ResultBean submitVehRebateWithApply(@RequestBody @Valid SubmitScmVehRebateWithApplyDto dto); + + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody ScmVehRebateWithApplyCompleteDto dto); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo); + + @ApiOperation(value = "流程历史流转记录") + @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}") + public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java index 858f54ce69..47c9d2f99c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java @@ -25,6 +25,11 @@ *********************************************************/ package com.yxt.anrui.scm.api.scmvehrebatewithapply; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyCompleteDto; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -69,4 +74,44 @@ public class ScmVehRebateWithApplyFeignFallback implements ScmVehRebateWithApply ResultBean rb = ResultBean.fireFail(); return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/fetchDetailsBySid无法访问"); } + + @Override + public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { + return null; + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeQuery.java new file mode 100644 index 0000000000..9cd8dd85da --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmvehrebatewithapply.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/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty(value = "分支字段及业务字段") + private Map formVariables; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeVo.java new file mode 100644 index 0000000000..f76286b83f --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyCompleteDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyCompleteDto.java new file mode 100644 index 0000000000..43d9564974 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyCompleteDto.java @@ -0,0 +1,42 @@ +package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class ScmVehRebateWithApplyCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @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 formVariables = new HashMap<>(); +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyTaskQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyTaskQuery.java new file mode 100644 index 0000000000..e1c8ef4472 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/ScmVehRebateWithApplyTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.scm.api.scmvehrebatewithapply.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/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class ScmVehRebateWithApplyTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @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("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/SubmitScmVehRebateWithApplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/SubmitScmVehRebateWithApplyDto.java new file mode 100644 index 0000000000..9615e73da1 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/flow/SubmitScmVehRebateWithApplyDto.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.scm.api.scmvehrebatewithapply.flow; + +import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitScmVehRebateWithApplyDto extends ScmApplyInboundDto { + private static final long serialVersionUID = 378585162071125756L; + /*@ApiModelProperty("意见") + private String comment;*/ + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; + /* @ApiModelProperty("业务sid") + private String businessSid; + @ApiModelProperty("流程定义id") + private String modelId; + @ApiModelProperty("下一环节的代办人sid") + private String nextNodeUserSids;*/ + +} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java index 3f93c3ca51..bd68b528c5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java @@ -25,6 +25,14 @@ *********************************************************/ package com.yxt.anrui.scm.biz.scmvehrebatewithapply; +import cn.hutool.core.bean.BeanUtil; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyCompleteDto; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -92,4 +100,47 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign { public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ return scmVehRebateWithApplyService.fetchAllDetailsVo(sid); } + + @Override + public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) { + return scmVehRebateWithApplyService.submitVehRebateWithApply(dto); + } + + @Override + public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(dto, bv); + bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + return scmVehRebateWithApplyService.complete(bv); + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return scmVehRebateWithApplyService.revokeProcess(flowTaskVo); + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return scmVehRebateWithApplyService.taskReject(flowTaskVo); + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return scmVehRebateWithApplyService.breakProcess(flowTaskVo); + } + + @Override + public ResultBean flowRecord(String procInsId) { + return scmVehRebateWithApplyService.flowRecord(procInsId); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return scmVehRebateWithApplyService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return scmVehRebateWithApplyService.getPreviousNodesForReject(query); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 03d2fdefe7..2ab6b49c7c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -28,8 +28,13 @@ package com.yxt.anrui.scm.biz.scmvehrebatewithapply; 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.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.SubmitScmVehRebateWithApplyDto; import com.yxt.anrui.scm.biz.scmvehrebatewith.ScmVehRebateWithService; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -172,4 +177,36 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } } \ No newline at end of file