From 7f5a36447c1582beb3cd227dc3f39a41e1847e51 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Tue, 31 Oct 2023 15:34:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=94=B6=E4=B9=B0=E6=96=AD=E3=80=81?= =?UTF-8?q?=E5=A4=96=E9=87=87=E7=94=B3=E8=AF=B7=E3=80=81=E6=8E=92=E4=BA=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=A2=9E=E5=8A=A0=E5=8A=A0=E7=AD=BE=E8=BD=AC?= =?UTF-8?q?=E5=8A=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseOutsourcingApplicationFeign.java | 10 +++++++ ...seOutsourcingApplicationFeignFallback.java | 11 ++++++++ ...seOutsourcingApplicationDelegateQuery.java | 24 +++++++++++++++++ .../BaseVehicleActualSalesFeign.java | 11 ++++++++ .../BaseVehicleActualSalesFeignFallback.java | 10 +++++++ .../BaseVehicleActualSalesDelegateQuery.java | 24 +++++++++++++++++ .../busvehicleapply/BusVehicleApplyFeign.java | 12 +++++++++ .../BusVehicleApplyFeignFallback.java | 10 +++++++ .../flow/AppBusVehicleApplyDelegateQuery.java | 24 +++++++++++++++++ .../BaseOutsourcingApplicationRest.java | 12 +++++++++ .../BaseOutsourcingApplicationService.java | 20 ++++++++++++++ .../BaseVehicleActualSalesRest.java | 10 +++++++ .../BaseVehicleActualSalesService.java | 24 ++++++++++++++--- .../busvehicleapply/BusVehicleApplyRest.java | 10 +++++++ .../BusVehicleApplyService.java | 23 +++++++++++++--- .../ExternalPurchaseFeign.java | 13 +++++++++ .../flowable/ExternalDelegateQuery.java | 25 +++++++++++++++++ .../unsoldBuyout/UnsoldBuyoutFeign.java | 13 +++++++++ .../flowable/UnsoldBuyoutDelegateQuery.java | 25 +++++++++++++++++ .../vehicleApply/VehicleApplyFeign.java | 13 +++++++++ .../flowable/VehicleApplyDelegateQuery.java | 25 +++++++++++++++++ .../ExternalPurchaseRest.java | 11 ++++++++ .../ExternalPurchaseService.java | 21 +++++++++++++++ .../unsoldBuyout/UnsoldBuyoutRest.java | 11 ++++++++ .../unsoldBuyout/UnsoldBuyoutService.java | 27 ++++++++++++++++--- .../vehicleApply/VehicleApplyRest.java | 11 ++++++++ .../vehicleApply/VehicleApplyService.java | 27 +++++++++++++++---- 27 files changed, 440 insertions(+), 17 deletions(-) create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/flow/BaseOutsourcingApplicationDelegateQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseVehicleActualSalesDelegateQuery.java create mode 100644 anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/AppBusVehicleApplyDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/flowable/ExternalDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/flowable/UnsoldBuyoutDelegateQuery.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/flowable/VehicleApplyDelegateQuery.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java index 66d059b5fd..7a0d435795 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.api.baseoutsourcingapplication; +import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.BaseOutsourcingApplicationDelegateQuery; import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.flow.FlowTaskVo; @@ -141,6 +142,15 @@ public interface BaseOutsourcingApplicationFeign { public ResultBean getUsersByRoleSid( @ApiParam(value = "组织架构sid")@RequestParam("orgSid") String orgSid, @ApiParam(value = "角色sid")@RequestParam("roleSid") String roleSid); + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody BaseOutsourcingApplicationDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody BaseOutsourcingApplicationDelegateQuery query); //-------------------------App--------------------------------------------------------- diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java index 7ab426e640..72489c1700 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.base.api.baseoutsourcingapplication; +import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.BaseOutsourcingApplicationDelegateQuery; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.common.core.query.PagerQuery; @@ -128,6 +129,16 @@ public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingA return null; } + @Override + public ResultBean delegate(BaseOutsourcingApplicationDelegateQuery query) { + return null; + } + + @Override + public ResultBean assignTask(BaseOutsourcingApplicationDelegateQuery query) { + return null; + } + @Override public ResultBean getExternalPurchase(String sid) { return null; diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/flow/BaseOutsourcingApplicationDelegateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/flow/BaseOutsourcingApplicationDelegateQuery.java new file mode 100644 index 0000000000..792665a736 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/flow/BaseOutsourcingApplicationDelegateQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.baseoutsourcingapplication.flow; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:58 + */ +@Data +public class BaseOutsourcingApplicationDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeign.java index 21a2b57039..7e5c845115 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeign.java @@ -1,6 +1,7 @@ package com.yxt.anrui.base.api.basevehicleactualsales; import com.yxt.anrui.base.api.basevehicleactualsales.flow.*; +import com.yxt.anrui.base.api.busvehicleapply.flow.AppBusVehicleApplyDelegateQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -84,4 +85,14 @@ public interface BaseVehicleActualSalesFeign { @GetMapping(value = "/getUnsoldBuyout/{sid}") @ResponseBody ResultBean getUnsoldBuyout(@PathVariable("sid") String sid); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody BaseVehicleActualSalesDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody BaseVehicleActualSalesDelegateQuery query); } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeignFallback.java index 0fd6f18310..960b72d294 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/BaseVehicleActualSalesFeignFallback.java @@ -74,4 +74,14 @@ public class BaseVehicleActualSalesFeignFallback implements BaseVehicleActualSal public ResultBean getUnsoldBuyout(String sid) { return null; } + + @Override + public ResultBean delegate(BaseVehicleActualSalesDelegateQuery query) { + return null; + } + + @Override + public ResultBean assignTask(BaseVehicleActualSalesDelegateQuery query) { + return null; + } } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseVehicleActualSalesDelegateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseVehicleActualSalesDelegateQuery.java new file mode 100644 index 0000000000..f42576cfcf --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleactualsales/flow/BaseVehicleActualSalesDelegateQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.basevehicleactualsales.flow; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:48 + */ +@Data +public class BaseVehicleActualSalesDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java index 9760149f02..cdcdf4473e 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeign.java @@ -101,4 +101,16 @@ public interface BusVehicleApplyFeign { @ApiOperation(value = "采购渠道推送厂家采购") @PostMapping(value = "/pushApply") ResultBean pushApply(@RequestBody BusApplyPushDto dto); + + @ApiOperation(value = "加签") + @PostMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody AppBusVehicleApplyDelegateQuery query); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody AppBusVehicleApplyDelegateQuery query); + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java index de241c63dc..b4a8016436 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyFeignFallback.java @@ -111,4 +111,14 @@ public class BusVehicleApplyFeignFallback implements BusVehicleApplyFeign { public ResultBean pushApply(BusApplyPushDto dto) { return null; } + + @Override + public ResultBean delegate(AppBusVehicleApplyDelegateQuery query) { + return null; + } + + @Override + public ResultBean assignTask(AppBusVehicleApplyDelegateQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/AppBusVehicleApplyDelegateQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/AppBusVehicleApplyDelegateQuery.java new file mode 100644 index 0000000000..87c854c523 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/flow/AppBusVehicleApplyDelegateQuery.java @@ -0,0 +1,24 @@ +package com.yxt.anrui.base.api.busvehicleapply.flow; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:42 + */ +@Data +public class AppBusVehicleApplyDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") +// @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java index 2095c21f29..c5387d1bea 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java @@ -27,8 +27,10 @@ package com.yxt.anrui.base.biz.baseoutsourcingapplication; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.baseoutsourcingapplication.*; +import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.BaseOutsourcingApplicationDelegateQuery; import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleVo; +import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseVehicleActualSalesDelegateQuery; import com.yxt.anrui.base.api.flow.FlowTaskVo; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; @@ -174,4 +176,14 @@ public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicatio public ResultBean getExternalPurchase(String sid) { return baseOutsourcingApplicationService.getExternalPurchase(sid); } + + @Override + public ResultBean delegate(BaseOutsourcingApplicationDelegateQuery query) { + return baseOutsourcingApplicationService.delegate(query); + } + + @Override + public ResultBean assignTask(BaseOutsourcingApplicationDelegateQuery query) { + return baseOutsourcingApplicationService.assignTask(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java index 152b2d3032..4b7034ea88 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java @@ -35,10 +35,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer; import com.yxt.anrui.base.api.baseoutsourcingapplication.*; +import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.BaseOutsourcingApplicationDelegateQuery; import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto; import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo; +import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseVehicleActualSalesDelegateQuery; import com.yxt.anrui.base.api.commonappendix.CommonAppendix; import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo; import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; @@ -55,6 +57,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; @@ -1033,4 +1036,21 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService getUnsoldBuyout(String sid) { return baseVehicleActualSalesService.getUnsoldBuyout(sid); } + + @Override + public ResultBean delegate(BaseVehicleActualSalesDelegateQuery query) { + return baseVehicleActualSalesService.delegate(query); + } + + @Override + public ResultBean assignTask(BaseVehicleActualSalesDelegateQuery query) { + return baseVehicleActualSalesService.assignTask(query); + } } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java index b6e525768f..41d56fa3b0 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java @@ -19,11 +19,9 @@ import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto; import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo; import com.yxt.anrui.base.api.basevehicleactualsales.*; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQuery; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.SubmitActualSalesDto; +import com.yxt.anrui.base.api.basevehicleactualsales.flow.*; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApply; +import com.yxt.anrui.base.api.busvehicleapply.flow.AppBusVehicleApplyDelegateQuery; import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService; import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService; import com.yxt.anrui.base.biz.basevehicleactualdetails.BaseVehicleActualDetailsService; @@ -37,6 +35,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; import com.yxt.anrui.flowable.api.flow2.FlowFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; @@ -935,4 +934,21 @@ public class BaseVehicleActualSalesService extends MybatisBaseService getFlowOperateTitle(@SpringQueryMap ExternalPurchaseQuery query); + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody ExternalDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody ExternalDelegateQuery delegateQuery); + + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/flowable/ExternalDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/flowable/ExternalDelegateQuery.java new file mode 100644 index 0000000000..c94f63109c --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/flowable/ExternalDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:56 + */ +@Data +public class ExternalDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutFeign.java index 91d6a029c2..3ca151836b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/UnsoldBuyoutFeign.java @@ -1,8 +1,10 @@ package com.yxt.anrui.terminal.api.supplychain.unsoldBuyout; +import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDto; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDelegateQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -54,4 +56,15 @@ public interface UnsoldBuyoutFeign { ResultBean getFlowOperateTitle(@SpringQueryMap UnsoldBuyoutQuery query); + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody UnsoldBuyoutDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody UnsoldBuyoutDelegateQuery delegateQuery); + + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/flowable/UnsoldBuyoutDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/flowable/UnsoldBuyoutDelegateQuery.java new file mode 100644 index 0000000000..cfc55ebc4a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/unsoldBuyout/flowable/UnsoldBuyoutDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:52 + */ +@Data +public class UnsoldBuyoutDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java index cbc22f49ab..b59f36058c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/VehicleApplyFeign.java @@ -1,5 +1,7 @@ package com.yxt.anrui.terminal.api.supplychain.vehicleApply; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDto; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyTaskQuery; @@ -58,6 +60,17 @@ public interface VehicleApplyFeign { @ResponseBody ResultBean getFlowOperateTitle(@SpringQueryMap VehicleApplyQuery query); + @ApiOperation(value = "加签") + @PutMapping(value = "/delegate") + @ResponseBody + public ResultBean delegate(@RequestBody VehicleApplyDelegateQuery delegateQuery); + + @ApiOperation(value = "转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody VehicleApplyDelegateQuery delegateQuery); + + /* @ApiOperation("厂家采购分享") @PostMapping("/shareMessage") @ResponseBody diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/flowable/VehicleApplyDelegateQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/flowable/VehicleApplyDelegateQuery.java new file mode 100644 index 0000000000..f5ca97d903 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehicleApply/flowable/VehicleApplyDelegateQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable; + +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author Administrator + * @description + * @date 2023/10/31 13:38 + */ +@Data +public class VehicleApplyDelegateQuery { + @ApiModelProperty + private String userSid; + @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") + private String instanceId; + @ApiModelProperty("任务Id") + private String taskId; + @ApiModelProperty("审批人sid") + private String assignee; + @ApiModelProperty("填写意见") + private String views; +} diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseRest.java index bb6cf59253..6e7930ca0d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.supplychain.externalPurchase; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.ExternalPurchaseFeign; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.ExternalPurchaseVo; +import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseDto; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseQuery; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseTaskQuery; @@ -54,4 +55,14 @@ public class ExternalPurchaseRest implements ExternalPurchaseFeign { public ResultBean getFlowOperateTitle(ExternalPurchaseQuery query) { return externalPurchaseService.getFlowOperateTitle(query); } + + @Override + public ResultBean delegate(ExternalDelegateQuery delegateQuery) { + return externalPurchaseService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(ExternalDelegateQuery delegateQuery) { + return externalPurchaseService.assignTask(delegateQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java index 58d533081d..460925d429 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/externalPurchase/ExternalPurchaseService.java @@ -5,16 +5,20 @@ import com.yxt.anrui.base.api.baseoutsourcingapplication.AppBaseOutsourcingAppli import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto; import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign; import com.yxt.anrui.base.api.baseoutsourcingapplication.BusinessVariablesDto; +import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.BaseOutsourcingApplicationDelegateQuery; import com.yxt.anrui.base.api.baseoutsourcingapplication.flow.GetNodeVo; +import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseVehicleActualSalesDelegateQuery; import com.yxt.anrui.base.api.flow.FlowTaskVo; 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.anrui.terminal.api.supplychain.externalPurchase.ExternalPurchaseVo; +import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseDto; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseQuery; import com.yxt.anrui.terminal.api.supplychain.externalPurchase.flowable.ExternalPurchaseTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDelegateQuery; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -139,4 +143,21 @@ public class ExternalPurchaseService { } return rb.success().setData(data); } + + public ResultBean delegate(ExternalDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BaseOutsourcingApplicationDelegateQuery delegateQuery1 = new + BaseOutsourcingApplicationDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = baseOutsourcingApplicationFeign.delegate(delegateQuery1); + return rb.success(); + } + public ResultBean assignTask(ExternalDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BaseOutsourcingApplicationDelegateQuery delegateQuery1 = new + BaseOutsourcingApplicationDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = baseOutsourcingApplicationFeign.assignTask(delegateQuery1); + return rb.success(); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutRest.java index b30bb12783..7a7c6a6c17 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutRest.java @@ -2,6 +2,7 @@ package com.yxt.anrui.terminal.biz.supplychain.unsoldBuyout; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.UnsoldBuyoutFeign; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.UnsoldBuyoutVo; +import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDto; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutTaskQuery; @@ -53,4 +54,14 @@ public class UnsoldBuyoutRest implements UnsoldBuyoutFeign { public ResultBean getFlowOperateTitle(UnsoldBuyoutQuery query) { return unsoldBuyoutService.getFlowOperateTitle(query); } + + @Override + public ResultBean delegate(UnsoldBuyoutDelegateQuery delegateQuery) { + return unsoldBuyoutService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(UnsoldBuyoutDelegateQuery delegateQuery) { + return unsoldBuyoutService.assignTask(delegateQuery); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java index 95d1bb68c2..bab8c4ca44 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/unsoldBuyout/UnsoldBuyoutService.java @@ -3,18 +3,18 @@ package com.yxt.anrui.terminal.biz.supplychain.unsoldBuyout; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basevehicleactualsales.AppBaseVehicleActualSalesVo; import com.yxt.anrui.base.api.basevehicleactualsales.BaseVehicleActualSalesFeign; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeVo; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesCompleteDto; -import com.yxt.anrui.base.api.basevehicleactualsales.flow.BaseActualSalesTaskQuery; +import com.yxt.anrui.base.api.basevehicleactualsales.flow.*; +import com.yxt.anrui.base.api.busvehicleapply.flow.AppBusVehicleApplyDelegateQuery; 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.anrui.terminal.api.supplychain.unsoldBuyout.UnsoldBuyoutVo; +import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutDto; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutQuery; import com.yxt.anrui.terminal.api.supplychain.unsoldBuyout.flowable.UnsoldBuyoutTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDelegateQuery; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -141,4 +141,23 @@ public class UnsoldBuyoutService { } return rb.success().setData(data); } + + + public ResultBean delegate(UnsoldBuyoutDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleActualSalesDelegateQuery delegateQuery1 = new + BaseVehicleActualSalesDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = baseVehicleActualSalesFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(UnsoldBuyoutDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + BaseVehicleActualSalesDelegateQuery delegateQuery1 = new + BaseVehicleActualSalesDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = baseVehicleActualSalesFeign.assignTask(delegateQuery1); + return rb.success(); + } } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java index 2859be5f75..febab04dd8 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyRest.java @@ -4,6 +4,7 @@ import com.yxt.anrui.terminal.api.supplychain.vehicleApply.ShareVehicleApplyQuer import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyFeign; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplySzVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDto; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyTaskQuery; @@ -61,6 +62,16 @@ public class VehicleApplyRest implements VehicleApplyFeign { return vehicleApplyService.getFlowOperateTitle(query); } + @Override + public ResultBean delegate(VehicleApplyDelegateQuery delegateQuery) { + return vehicleApplyService.delegate(delegateQuery); + } + + @Override + public ResultBean assignTask(VehicleApplyDelegateQuery delegateQuery) { + return vehicleApplyService.assignTask(delegateQuery); + } + /* @Override public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { return vehicleApplyService.shareMessage(shareQuery); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java index 8c676da7e9..45fedf0ead 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehicleApply/VehicleApplyService.java @@ -5,10 +5,8 @@ import com.alibaba.fastjson.JSONObject; import com.yxt.anrui.base.api.busvehicleapply.BusVehicleApplyFeign; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplySzVo; import com.yxt.anrui.base.api.busvehicleapply.app.AppVehicleApplyVo; -import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyCompleteDto; -import com.yxt.anrui.base.api.busvehicleapply.flow.BusVehicleApplyTaskQuery; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeQuery; -import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo; +import com.yxt.anrui.base.api.busvehicleapply.flow.*; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; import com.yxt.anrui.portal.api.appsubsetversion.AppSubsetVersionFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; @@ -19,6 +17,7 @@ import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyCarPageVo import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyListVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplySzVo; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.VehicleApplyVo; +import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDelegateQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyDto; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery; import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyTaskQuery; @@ -68,7 +67,7 @@ public class VehicleApplyService { map.put("modelSid", modelSid); map.put("configSid", configSid); map.put("selectType", 0); - map.put("orgPath",vehicleApplyVo.getOrgPath()); + map.put("orgPath", vehicleApplyVo.getOrgPath()); appSubVersionVo.setJson(JSONObject.toJSONString(map)); BeanUtil.copyProperties(appSubVersionVo, appVehicleVersionVo); record.setCarDetailPage(appVehicleVersionVo); @@ -177,6 +176,24 @@ public class VehicleApplyService { return rb.success().setData(resultBean.getData()); } + public ResultBean delegate(VehicleApplyDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + AppBusVehicleApplyDelegateQuery delegateQuery1 = new + AppBusVehicleApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = busVehicleApplyFeign.delegate(delegateQuery1); + return rb.success(); + } + + public ResultBean assignTask(VehicleApplyDelegateQuery delegateQuery) { + ResultBean rb = ResultBean.fireFail(); + AppBusVehicleApplyDelegateQuery delegateQuery1 = new + AppBusVehicleApplyDelegateQuery(); + BeanUtil.copyProperties(delegateQuery, delegateQuery1); + ResultBean delegate = busVehicleApplyFeign.assignTask(delegateQuery1); + return rb.success(); + } + /* public ResultBean shareMessage(ShareVehicleApplyQuery shareQuery) { ResultBean rb = ResultBean.fireFail(); ShareBusVehicleApplyQuery shareBusVehicleApplyQuery = new ShareBusVehicleApplyQuery();