From 3145b7cc7459f4fc57cfd9b4b1946a2d71ddce39 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Wed, 10 Aug 2022 19:54:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E9=AA=8C=E8=BD=A6=20=E7=9B=98=E5=BA=93=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=20=E5=B7=A1=E6=A3=80=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppBusDepositBuscenterDetailVo.java | 7 + .../api/busdeposit/BusDepositFeign.java | 11 +- .../busdeposit/BusDepositFeignFallback.java | 9 - .../AppBusDepositVehicleDetailVo.java | 7 + .../BusDepositVehicleFeign.java | 8 - .../BusDepositVehicleFeignFallback.java | 9 +- .../api/busmaindeposit/BusMainDeposit.java | 6 +- .../busmaindeposit/BusMainDepositFeign.java | 28 +- .../BusMainDepositFeignFallback.java | 22 ++ .../ScmVirtualOrderDepositCompleteDto.java | 3 +- ...VirtualOrderDepositVehicleCompleteDto.java | 2 +- .../SubmitVirtualOrderDepositDto.java | 2 +- .../SubmitVirtualOrderVehicleDto.java | 2 +- .../biz/busdeposit/BusDepositRest.java | 19 -- .../biz/busdeposit/BusDepositService.java | 16 +- .../BusDepositVehicleMapper.java | 3 + .../BusDepositVehicleMapper.xml | 5 + .../BusDepositVehicleRest.java | 19 -- .../BusDepositVehicleService.java | 17 +- .../busmaindeposit/BusMainDepositMapper.xml | 3 + .../busmaindeposit/BusMainDepositRest.java | 31 +++ .../busmaindeposit/BusMainDepositService.java | 250 +++++++++++------- .../AppScmVehicleEnterlibraryPageQuery.java | 9 + .../AppScmVehicleExaminePageQuery.java | 9 + ...AppScmVehicleStayInventoryDetailedsVo.java | 5 + .../AppScmVehicleStayInventoryDto.java | 13 +- .../AppScmVehicleStayInventoryInfoVo.java | 17 +- .../ScmVehicleInventoryFeign.java | 2 +- .../ScmVehicleEnterlibraryService.java | 11 +- .../ScmVehicleExamineService.java | 13 +- .../ScmVehicleInventoryMapper.xml | 4 +- .../ScmVehicleInventoryRest.java | 2 +- .../ScmVehicleInventoryService.java | 76 +++++- .../ScmVehicleStayInventoryMapper.java | 2 +- .../ScmVehicleStayInventoryMapper.xml | 1 + .../ScmVehicleStayInventoryService.java | 6 +- .../ScmVehicleStayPatrolinspectionMapper.java | 2 +- .../ScmVehicleStayPatrolinspectionMapper.xml | 5 +- ...ScmVehicleStayPatrolinspectionService.java | 2 +- .../virtualOrders/AppBusMainDepositFeign.java | 10 +- .../deposit/DepositBuscenterDetailVo.java | 7 + .../deposit/DepositCompleteDto.java | 3 +- .../flowable/ScmVirtualOrderTaskQuery.java | 2 + .../vehicle/DepositVehicleDetailVo.java | 7 + .../vehicle/SubmitVehicleDto.java | 2 + .../vehicle/VehicleCompleteDto.java | 2 + .../inventory/StayInventoryDto.java | 5 + .../inventory/StayInventoryInfoVo.java | 5 + .../AppEnterlibraryPageQuery.java | 3 + .../AppExaminePageQuery.java | 9 + .../AppBusMainDepositService.java | 39 ++- 51 files changed, 504 insertions(+), 248 deletions(-) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/{busdeposit => busmaindeposit/flowable}/ScmVirtualOrderDepositCompleteDto.java (92%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/{busdepositvehicle => busmaindeposit/flowable}/ScmVirtualOrderDepositVehicleCompleteDto.java (95%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/{busdeposit => busmaindeposit/flowable}/SubmitVirtualOrderDepositDto.java (89%) rename anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/{busdepositvehicle => busmaindeposit/flowable}/SubmitVirtualOrderVehicleDto.java (89%) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java index 4155ff1dbf..a0f470d174 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/AppBusDepositBuscenterDetailVo.java @@ -69,4 +69,11 @@ public class AppBusDepositBuscenterDetailVo implements Vo { @ApiModelProperty("缴费凭证") private String paymentProof; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "流程id") + private String procInsId; + @ApiModelProperty(value = "任务id") + private String taskId; + } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java index c88078047a..a3fbcaed12 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeign.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.busdeposit; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderDepositDto; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,14 +42,4 @@ public interface BusDepositFeign { @GetMapping("/getDepositInfoDetails/{virtualOrderSid}") public ResultBean getDepositInfoDetails(@PathVariable("virtualOrderSid") String virtualOrderSid); - @ApiOperation("提交虚拟订单审批流程（订金收取）") - @PostMapping("/submitVirtualOrderDeposit") - @ResponseBody - public ResultBean submitVirtualOrderDeposit(@Valid @RequestBody SubmitVirtualOrderDto dto); - - @ApiOperation(value = "办理（同意）（订金收取）") - @PostMapping("/complete") - @ResponseBody - public ResultBean complete(@Valid @RequestBody ScmVirtualOrderDepositCompleteDto query); - } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java index 9d7c04b63a..807dfface6 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/BusDepositFeignFallback.java @@ -30,13 +30,4 @@ public class BusDepositFeignFallback implements BusDepositFeign { return null; } - @Override - public ResultBean submitVirtualOrderDeposit(SubmitVirtualOrderDto dto) { - return null; - } - - @Override - public ResultBean complete(ScmVirtualOrderDepositCompleteDto 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/busdepositvehicle/AppBusDepositVehicleDetailVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java index 11873c922e..ba2b6b7677 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/AppBusDepositVehicleDetailVo.java @@ -37,6 +37,13 @@ public class AppBusDepositVehicleDetailVo implements Vo { @ApiModelProperty(value = "说明") private String explain; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "流程id") + private String procInsId; + @ApiModelProperty(value = "任务id") + private String taskId; + @ApiModelProperty(value = "车辆信息集合") private List vehicleList; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeign.java index af124d3e7e..d9dad56272 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeign.java @@ -59,13 +59,5 @@ public interface BusDepositVehicleFeign { @GetMapping("/getReserveCarDetails/{virtualOrderSid}") public ResultBean getReserveCarDetails(@PathVariable("virtualOrderSid") String virtualOrderSid); - @ApiOperation("提交虚拟订单审批流程（预定车辆）") - @PostMapping("/submitVirtualOrderVehicle") - @ResponseBody - public ResultBean submitVirtualOrderVehicle(@Valid @RequestBody SubmitVirtualOrderDto dto); - @ApiOperation(value = "办理（同意）") - @PostMapping("/complete") - @ResponseBody - public ResultBean complete(@Valid @RequestBody ScmVirtualOrderDepositVehicleCompleteDto query); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeignFallback.java index aa5a9c4984..5d4a66d437 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/BusDepositVehicleFeignFallback.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.busdepositvehicle; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositVehicleCompleteDto; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -57,13 +58,5 @@ public class BusDepositVehicleFeignFallback implements BusDepositVehicleFeign { return null; } - @Override - public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderDto dto) { - return null; - } - @Override - public ResultBean complete(ScmVirtualOrderDepositVehicleCompleteDto 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/busmaindeposit/BusMainDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java index fe04523040..15a57e295e 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java @@ -81,13 +81,13 @@ public class BusMainDeposit extends BaseEntity { @ApiModelProperty(value = "节点状态") private String nodeState; - @ApiModelProperty("节点id") - private String nodeId; @ApiModelProperty("流程定义的id") private String procDefId; @ApiModelProperty("流程实例的id") - private String procInstId; + private String procInsId; @ApiModelProperty(value = "任务id") private String taskId; + @ApiModelProperty(value = "环节定义的ID") + private String taskDefKey; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java index aea6f619ef..ef313f1cb5 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeign.java @@ -25,7 +25,9 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busmaindeposit; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositCompleteDto; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositVehicleCompleteDto; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*; @@ -144,7 +146,6 @@ public interface BusMainDepositFeign { public ResultBean deleteVirtualOrder(@PathVariable("userSid") String userSid, @PathVariable("virtualOrderSid") String virtualOrderSid); - @ResponseBody @PostMapping(value = "/pageAppList") @ApiOperation(value = "App销售订单-虚拟订单分页列表") @@ -153,6 +154,25 @@ public interface BusMainDepositFeign { /*----------------------------------------------新虚拟订单流程--------------------------------------------------------*/ + @ApiOperation("提交虚拟订单审批流程（订金收取）") + @PostMapping("/submitVirtualOrderDeposit") + @ResponseBody + public ResultBean submitVirtualOrderDeposit(@Valid @RequestBody SubmitVirtualOrderDepositDto dto); + + @ApiOperation(value = "办理（同意）（订金收取）") + @PutMapping("/completeDeposit") + @ResponseBody + public ResultBean completeDeposit(@Valid @RequestBody ScmVirtualOrderDepositCompleteDto query); + + @ApiOperation("提交虚拟订单审批流程（预定车辆）") + @PostMapping("/submitVirtualOrderVehicle") + @ResponseBody + public ResultBean submitVirtualOrderVehicle(@Valid @RequestBody SubmitVirtualOrderVehicleDto dto); + + @ApiOperation(value = "办理（同意）") + @PutMapping("/completeVehicle") + @ResponseBody + public ResultBean completeVehicle(@Valid @RequestBody ScmVirtualOrderDepositVehicleCompleteDto query); @ApiOperation(value = "获取上一个环节") @PostMapping(value = "/getPreviousNodesForReject") @@ -165,17 +185,17 @@ public interface BusMainDepositFeign { ResultBean> getNextNodesForSubmit(@Valid @RequestBody AppGetNodeQuery query); @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") + @PutMapping(value = "/reject") @ResponseBody public ResultBean taskReject(@Valid @RequestBody AppScmVirtualOrderTaskQuery query); @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") + @PutMapping(value = "/revokeProcess") @ResponseBody public ResultBean revokeProcess(@Valid @RequestBody AppScmVirtualOrderTaskQuery query); @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") + @PutMapping(value = "/breakProcess") @ResponseBody public ResultBean breakProcess(@Valid @RequestBody AppScmVirtualOrderTaskQuery query); diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java index 938d36b1d3..8dca4c834a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDepositFeignFallback.java @@ -25,7 +25,9 @@ *********************************************************/ package com.yxt.anrui.buscenter.api.busmaindeposit; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositCompleteDto; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositVehicleCompleteDto; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*; @@ -220,6 +222,26 @@ public class BusMainDepositFeignFallback implements BusMainDepositFeign { return null; } + @Override + public ResultBean submitVirtualOrderDeposit(SubmitVirtualOrderDepositDto dto) { + return null; + } + + @Override + public ResultBean completeDeposit(ScmVirtualOrderDepositCompleteDto query) { + return null; + } + + @Override + public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) { + return null; + } + + @Override + public ResultBean completeVehicle(ScmVirtualOrderDepositVehicleCompleteDto query) { + return null; + } + @Override public ResultBean> getPreviousNodesForReject(AppGetNodeQuery query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/ScmVirtualOrderDepositCompleteDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositCompleteDto.java similarity index 92% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/ScmVirtualOrderDepositCompleteDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositCompleteDto.java index b96b9c3cc2..a34bd0bff8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/ScmVirtualOrderDepositCompleteDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositCompleteDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.busdeposit; +package com.yxt.anrui.buscenter.api.busmaindeposit.flowable; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; @@ -14,7 +14,6 @@ public class ScmVirtualOrderDepositCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/ScmVirtualOrderDepositVehicleCompleteDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java similarity index 95% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/ScmVirtualOrderDepositVehicleCompleteDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java index f3e24af964..9a1e571d4c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/ScmVirtualOrderDepositVehicleCompleteDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/ScmVirtualOrderDepositVehicleCompleteDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.busdepositvehicle; +package com.yxt.anrui.buscenter.api.busmaindeposit.flowable; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/SubmitVirtualOrderDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderDepositDto.java similarity index 89% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/SubmitVirtualOrderDepositDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderDepositDto.java index 84359bf1d3..093ec4928a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeposit/SubmitVirtualOrderDepositDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderDepositDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.busdeposit; +package com.yxt.anrui.buscenter.api.busmaindeposit.flowable; import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/SubmitVirtualOrderVehicleDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderVehicleDto.java similarity index 89% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/SubmitVirtualOrderVehicleDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderVehicleDto.java index 4943a10c18..a0a08a5566 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositvehicle/SubmitVirtualOrderVehicleDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/flowable/SubmitVirtualOrderVehicleDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.busdepositvehicle; +package com.yxt.anrui.buscenter.api.busmaindeposit.flowable; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java index 3a275c2ac1..d71083f33c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositRest.java @@ -1,13 +1,7 @@ package com.yxt.anrui.buscenter.biz.busdeposit; -import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.buscenter.api.busdeposit.*; -import com.yxt.anrui.buscenter.api.busdeposit.SubmitVirtualOrderDepositDto; -import com.yxt.anrui.buscenter.api.busdeposit.ScmVirtualOrderDepositCompleteDto; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderDto; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; -import com.yxt.anrui.flowable.api.utils.ProcDefEnum; -import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; @@ -52,17 +46,4 @@ public class BusDepositRest implements BusDepositFeign { } - @Override - public ResultBean submitVirtualOrderDeposit(SubmitVirtualOrderDto dto) { - return busMainDepositService.submitVirtualOrder(dto); - } - - @Override - public ResultBean complete(ScmVirtualOrderDepositCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); - return busMainDepositService.complete(bv); - } - } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java index dd3c10db01..48b938628e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeposit/BusDepositService.java @@ -1,34 +1,24 @@ package com.yxt.anrui.buscenter.biz.busdeposit; -import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; -import com.yxt.anrui.buscenter.api.busdeposit.SubmitVirtualOrderDepositDto; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; import com.yxt.anrui.flowable.api.flow.FlowableFeign; -import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; -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.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.StringUtils; -import com.yxt.common.core.result.ResultBean; import lombok.extern.slf4j.Slf4j; +import org.bouncycastle.voms.VOMSAttribute; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * Project: anrui-buscenter(车辆订单)
@@ -111,7 +101,11 @@ public class BusDepositService extends MybatisBaseService list = new ArrayList<>(); String url = fileUploadComponent.getUrlPrefix() + vo.getPaymentProof(); list.add(url); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java index eace6426c0..095264f737 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.java @@ -69,4 +69,7 @@ public interface BusDepositVehicleMapper extends BaseMapper { * @return */ int updateFlowFiled(Map map); + + + int selByUserSid(@Param("createBySid") String createBySid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml index a95a517d0e..d521e3ca12 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleMapper.xml @@ -61,6 +61,11 @@ FROM bus_deposit_vehicle bdv WHERE bdv.billSid = #{virtualOrderSid} + UPDATE bus_deposit diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleRest.java index 392e6adeee..bc979ee0fc 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleRest.java @@ -98,23 +98,4 @@ public class BusDepositVehicleRest implements BusDepositVehicleFeign { public ResultBean getReserveCarDetails(String virtualOrderSid) { return busDepositVehicleService.getReserveCarDetails(virtualOrderSid); } - - /** - * 提交虚拟订单审批流程（预定车辆） - * - * @param dto - * @return - */ - @Override - public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderDto dto) { - return busMainDepositService.submitVirtualOrder(dto); - } - - @Override - public ResultBean complete(ScmVirtualOrderDepositVehicleCompleteDto query) { - BusinessVariables bv = new BusinessVariables(); - BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId()); - return busMainDepositService.complete(bv); - } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java index ada97ad764..95cc710799 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java @@ -3,11 +3,10 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle; 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.base.api.commoncontract.CommonContractFeign; -import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busdepositvehicle.*; import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderVehicleDto; import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService; import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService; import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo; @@ -16,7 +15,6 @@ import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; -import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -28,12 +26,12 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Stream; /** * Project: anrui-buscenter(车辆订单)
@@ -220,6 +218,8 @@ public class BusDepositVehicleService extends MybatisBaseService appBusDepositVehicleListVos = baseMapper.selVehicleListByBillSid(virtualOrderSid); vo.setVehicleList(appBusDepositVehicleListVos); + if (StringUtils.isNotBlank(busMainDeposit.getNodeState())) { + String createBySid = busMainDeposit.getCreateBySid(); + int count = baseMapper.selByUserSid(createBySid); +// Integer count = strings.stream().mapToInt(Integer::valueOf).sum(); + vo.setExplain("目前该销售人员已预订" + count + "台车辆"); + } return new ResultBean().success().setData(vo); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml index b1081077be..64c55eeab8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositMapper.xml @@ -187,6 +187,9 @@ , procDefId=#{procDefId} + + , taskId=#{taskId} + , procInsId=#{procInsId} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java index 252587c740..db8a0d9a71 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositRest.java @@ -27,11 +27,15 @@ package com.yxt.anrui.buscenter.biz.busmaindeposit; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositCompleteDto; import com.yxt.anrui.buscenter.api.busdepositvehicle.AppBusDepositVehicleDto; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.ScmVirtualOrderDepositVehicleCompleteDto; import com.yxt.anrui.buscenter.api.busmaindeposit.*; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -339,6 +343,33 @@ public class BusMainDepositRest implements BusMainDepositFeign { return rb.success().setData(pv); } + @Override + public ResultBean submitVirtualOrderDeposit(SubmitVirtualOrderDepositDto dto) { + return busMainDepositService.submitVirtualDepositOrder(dto); + } + + @Override + public ResultBean completeDeposit(ScmVirtualOrderDepositCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); + return busMainDepositService.complete(bv); + } + + @Override + public ResultBean submitVirtualOrderVehicle(SubmitVirtualOrderVehicleDto dto) { + return busMainDepositService.submitVirtualVehicleOrder(dto); + } + + @Override + public ResultBean completeVehicle(ScmVirtualOrderDepositVehicleCompleteDto query) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId()); + return busMainDepositService.complete(bv); + } + + @Override public ResultBean> getPreviousNodesForReject(AppGetNodeQuery query) { return busMainDepositService.getPreviousNodesForReject(query); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java index 83e21afbd0..a6aed18f30 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java @@ -34,7 +34,6 @@ import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigFeign; import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo; import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; -import com.yxt.anrui.buscenter.api.busdeposit.SubmitVirtualOrderDepositDto; import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto; import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer; import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo; @@ -710,6 +709,7 @@ public class BusMainDepositService extends MybatisBaseService map = generateBillNo(dto.getUserSid()); busMainDeposit.setBillNo(map.get("billNo_Num")); + busMainDeposit.setCreateBySid(dto.getUserSid()); busMainDeposit.setStaffSid(appUserOrgInfoVo.getStaffSid()); busMainDeposit.setStaffName(appUserOrgInfoVo.getStaffName()); busMainDeposit.setOrgSid(appUserOrgInfoVo.getOrgSid()); @@ -1159,7 +1160,7 @@ public class BusMainDepositService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); @@ -1689,99 +1691,156 @@ public class BusMainDepositService extends MybatisBaseService resultBean = saveDepositInfo(dto.getAppBusDepositBuscenterDto()); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - businessSid = resultBean.getData(); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); - //业务sid - bv.setBusinessSid(businessSid); - //用户sid - bv.setUserSid(dto.getUserSid()); - bv.setFormVariables(variables); - //若app移动端有此功能，则传递appMap参数 - Map appMap = new HashMap<>(); - //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("sid", businessSid); - variables.put("app", appMap); - //流程定义id - bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); - if (r == 1) { - ResultBean voResultBean = flowableFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - return voResultBean; + //新增修改保存 + ResultBean resultBean = saveDepositInfo(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getUserSid()); + bv.setFormVariables(variables); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("virtualOrderSid", businessSid); + variables.put("app", appMap); + //流程定义id + bv.setModelId(ProcDefEnum.ORDERDEPOSITAPPROVE.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); + bv.setTaskId(busMainDeposit.getTaskId()); + bv.setTaskDefKey(busMainDeposit.getTaskDefKey()); + bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessDepositData(SubmitVirtualOrderDepositDto dto, BusMainDeposit busMainDeposit) { + int r = 0; + if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (busMainDeposit != null) { + String businessTaskId = busMainDeposit.getTaskId(); + if (com.yxt.common.base.utils.StringUtils.isBlank(businessTaskId) && com.yxt.common.base.utils.StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (com.yxt.common.base.utils.StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; } - bv.setTaskId(busMainDeposit.getTaskId()); - bv.setTaskDefKey(busMainDeposit.getNodeId()); - bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); - } - } else if (dto.getType().equals("2")) {//订车 - //新增修改保存 - ResultBean resultBean = reserveCarInfo(dto.getAppBusDepositVehicleDto()); - if (!resultBean.getSuccess()) { - return rb.setMsg(resultBean.getMsg()); - } - businessSid = resultBean.getData(); - //创建BusinessVariables实体对象 - BusinessVariables bv = new BusinessVariables(); - //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 - Map variables = new HashMap<>(); - //用户的部门全路径sid - bv.setOrgSidPath(orgSidPath); - //业务sid - bv.setBusinessSid(businessSid); - //用户sid - bv.setUserSid(dto.getUserSid()); - bv.setFormVariables(variables); - //若app移动端有此功能，则传递appMap参数 - Map appMap = new HashMap<>(); - //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 - appMap.put("sid", businessSid); - variables.put("app", appMap); - //流程定义id - bv.setModelId(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId()); - if (r == 1) { - ResultBean voResultBean = flowableFeign.startProcess(bv); - UpdateFlowFieldVo ufVo = voResultBean.getData(); - updateFlowFiled(BeanUtil.beanToMap(ufVo)); - return voResultBean; + } else { + r = 3; } - if (r == 2) { - // ToDo:驳回到发起人后再次提交 - if (com.yxt.common.base.utils.StringUtils.isBlank(dto.getInstanceId())) { - return rb.setMsg("参数错误：instanceId"); - } - bv.setTaskId(busMainDeposit.getTaskId()); - bv.setTaskDefKey(busMainDeposit.getNodeId()); - bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); - bv.setInstanceId(dto.getInstanceId()); - return complete(bv); + + } + return r; + } + + /** + * 订车提交接口 + * + * @param dto + * @return + */ + public ResultBean submitVirtualVehicleOrder(SubmitVirtualOrderVehicleDto dto) { + ResultBean rb = ResultBean.fireFail(); + //根据用户sid获取staffSid + ResultBean userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); + if (!userVoResultBean.getSuccess()) { + return rb.setMsg(userVoResultBean.getMsg()); + } + //根据staffSid获取用户的组织全路径 + ResultBean staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid()); + if (!staffOrgResultBean.getSuccess()) { + return rb.setMsg(staffOrgResultBean.getMsg()); + } + //用户的组织全路径 + String orgSidPath = staffOrgResultBean.getData().getOrgSidPath(); + BusMainDeposit busMainDeposit = fetchBySid(dto.getVirtualOrderSid()); + int r = submitBusinessVehicleData(dto, busMainDeposit); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + //新增修改保存 + ResultBean resultBean = reserveCarInfo(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getUserSid()); + bv.setFormVariables(variables); + //若app移动端有此功能，则传递appMap参数 + Map appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("virtualOrderSid", businessSid); + appMap.put("customerSid", dto.getCustomerSid()); + variables.put("app", appMap); + //流程定义id + bv.setModelId(ProcDefEnum.ORDERDEPOSITVEHICLEAPPROVE.getProDefId()); + if (r == 1) { + ResultBean 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(busMainDeposit.getTaskId()); + bv.setTaskDefKey(busMainDeposit.getTaskDefKey()); + bv.setComment(com.yxt.common.base.utils.StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); } return rb; } @@ -1789,6 +1848,9 @@ public class BusMainDepositService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -1807,17 +1869,17 @@ public class BusMainDepositService extends MybatisBaseService> getPreviousNodesForReject(AppGetNodeQuery query) { ResultBean> rb = new ResultBean<>(); BusinessVariables bv = new BusinessVariables(); @@ -1891,7 +1954,6 @@ public class BusMainDepositService extends MybatisBaseService * File: ScmVehicleStayInventoryVo.java
@@ -74,4 +76,7 @@ public class AppScmVehicleStayInventoryDetailedsVo implements Vo { @ApiModelProperty("上次盘库信息 无 默认null") private LastInfo lastInfo; + @ApiModelProperty("见证材料") + private List images; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java index de3cdb5753..05ad8e1f6a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleStayInventoryDto.java
@@ -79,11 +81,14 @@ public class AppScmVehicleStayInventoryDto implements Dto { @ApiModelProperty(value = "当前登录人sid") private String loginSid; - @ApiModelProperty(value = "是否有合格证") - private String certificate; +// @ApiModelProperty(value = "是否有合格证") +// private String certificate; +// +// @ApiModelProperty(value = "是否有合格证") +// private String certificateKey; - @ApiModelProperty(value = "是否有合格证") - private String certificateKey; + @ApiModelProperty("见证材料") + private List images; @ApiModelProperty(value = "状态 是否通过") @JsonProperty("InventoryState") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java index 45514343d5..9a2a494719 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/AppScmVehicleStayInventoryInfoVo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleStayInventoryVo.java
@@ -75,11 +77,15 @@ public class AppScmVehicleStayInventoryInfoVo implements Vo { @ApiModelProperty("本次盘库人员sid") private String inventorySid; - @ApiModelProperty("是否有合格证") - private String certificateType; +// @ApiModelProperty("是否有合格证") +// private String certificateType; +// +// @ApiModelProperty("是否有合格证") +// private String certificateKey; + + @ApiModelProperty("见证材料") + private List images; - @ApiModelProperty("是否有合格证") - private String certificateKey; @ApiModelProperty("状态 是否通过") private String stateType; @@ -90,4 +96,7 @@ public class AppScmVehicleStayInventoryInfoVo implements Vo { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("创建组织sid") + private String createOrgSid; + } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java index ba7e6acbfb..d534cda3d0 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehicleinventory/ScmVehicleInventoryFeign.java @@ -62,7 +62,7 @@ public interface ScmVehicleInventoryFeign { @ApiOperation("盘库修改状态") @PostMapping("/updateState") @ResponseBody - public ResultBean updateState(@RequestParam("sid") String sid,@RequestParam("InventoryStateKey") String InventoryStateKey,@RequestParam("InventoryState") String InventoryState,@RequestParam("certificateKey") String certificateKey,@RequestParam("certificate") String certificate,@RequestParam("remarks") String remarks); + public ResultBean updateState(@RequestParam("sid") String sid, @RequestParam("InventoryStateKey") String InventoryStateKey, @RequestParam("InventoryState") String InventoryState, @RequestParam("certificateKey") String certificateKey, @RequestParam("certificate") String certificate, @RequestParam("remarks") String remarks); @ApiOperation("新增或修改") @PostMapping("/save") diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java index d0b3647371..8209b274f8 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java @@ -216,8 +216,14 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService page = PagerUtil.queryToPage(pq); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pq.getParams().getUserSid()).getData(); pq.getParams().setUseOrgSid(useOrgSid); - QueryWrapper qw = appQueryWrapper(pq.getParams()); AppScmVehicleEnterlibraryPageQuery params = pq.getParams(); + String date = params.getDate(); + if (StringUtils.isNotBlank(date)) { + String[] s = date.split("至"); + params.setDateStart(s[0]); + params.setDateEnd(s[1]); + } + QueryWrapper qw = appQueryWrapper(pq.getParams()); IPage iPage = baseMapper.getCarWarehousingList(page, qw, params.getNames()); List records = iPage.getRecords(); for (AppScmVehicleEnterlibraryPageVo record : records) { @@ -242,6 +248,9 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService= date_format('" + query.getDateStart() + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(query.getDateEnd()), "date_format (sve.inboundDate,'%Y-%m-%d') <= date_format('" + query.getDateEnd() + "','%Y-%m-%d')" + ); return qw; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java index e6d26a5534..ac763d26c2 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java @@ -222,8 +222,14 @@ public class ScmVehicleExamineService extends MybatisBaseService page = PagerUtil.queryToPage(pagerQuery); String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData(); pagerQuery.getParams().setUseOrgSid(useOrgSid); - QueryWrapper qw = appQueryWrapper(pagerQuery.getParams()); AppScmVehicleExaminePageQuery params = pagerQuery.getParams(); + String date = params.getDate(); + if (StringUtils.isNotBlank(date)) { + String[] s = date.split("至"); + params.setDateStart(s[0]); + params.setDateEnd(s[1]); + } + QueryWrapper qw = appQueryWrapper(pagerQuery.getParams()); IPage iPage = baseMapper.getCarInspectedList(page, qw, params.getNames()); List records = iPage.getRecords(); for (AppScmVehicleExaminePageVo record : records) { @@ -248,6 +254,11 @@ public class ScmVehicleExamineService extends MybatisBaseService= date_format('" + inspectedStartDate + "','%Y-%m-%d')"). + apply(StringUtils.isNotEmpty(inspectedEndDate), "date_format (sve.inspectionDate,'%Y-%m-%d') <= date_format('" + inspectedEndDate + "','%Y-%m-%d')" + ); return qw; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml index 6df58c36b3..19737f79d5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryMapper.xml @@ -43,7 +43,8 @@ sid, mainSid as vin, location as warehouse, - locationSid as warehouseSid + locationSid as warehouseSid, + createOrgSid FROM scm_vehicle_stay_inventory WHERE sid = #{recordSid} @@ -86,6 +87,7 @@ certificateKey, InventoryState as stateType, InventoryStateKey as stateKey, + createOrgSid, remarks FROM scm_vehicle_inventory WHERE sid = #{recordSid} diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java index 0dc90d9a1d..1e88e23f89 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryRest.java @@ -70,7 +70,7 @@ public class ScmVehicleInventoryRest implements ScmVehicleInventoryFeign { @Override public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState, String certificateKey, String certificate, String remarks) { - return scmVehicleInventoryService.updateState(sid, inventoryStateKey, inventoryState, certificateKey, certificate, remarks); + return scmVehicleInventoryService.updateState(sid, inventoryStateKey, inventoryState, remarks); } @Override diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java index 0e724e9ef8..bd17ab56a0 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java @@ -30,9 +30,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; +import com.yxt.anrui.scm.api.scmfile.ScmFile; import com.yxt.anrui.scm.api.scmvehicleinventory.*; import com.yxt.anrui.scm.api.scmvehiclestayinventory.*; +import com.yxt.anrui.scm.biz.scmfile.ScmFileService; import com.yxt.anrui.scm.biz.scmvehiclestayinventory.ScmVehicleStayInventoryService; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -46,6 +49,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -71,6 +75,10 @@ public class ScmVehicleInventoryService extends MybatisBaseService createQueryWrapper(ScmVehicleInventoryQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -196,9 +204,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService images = new ArrayList<>(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventory(recordSid); - List scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), vo.getId()); + List scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), vo.getId(), vo.getCreateOrgSid()); if (scmVehicleStayInventoryVos.size() <= 0) { vo.setLastData("无"); } else { @@ -211,6 +221,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService scmFiles = scmFileService.selectByLinkSid(recordSid, type); + for (ScmFile scmFile : scmFiles) { + images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setImages(images); return vo; } @@ -221,10 +236,12 @@ public class ScmVehicleInventoryService extends MybatisBaseService images = new ArrayList<>(); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); AppScmVehicleStayInventoryInfoVo vo = baseMapper.getInventoryByRecordSid(recordSid); String id = scmVehicleStayInventoryService.getVin(vo.getVin()); - List scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), id); + List scmVehicleStayInventoryVos = scmVehicleStayInventoryService.selInventory(vo.getVin(), id, vo.getCreateOrgSid()); if (scmVehicleStayInventoryVos.size() <= 0) { vo.setLastData("无"); } else { @@ -237,6 +254,11 @@ public class ScmVehicleInventoryService extends MybatisBaseService scmFiles = scmFileService.selectByLinkSid(recordSid, type); + for (ScmFile scmFile : scmFiles) { + images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setImages(images); return vo; } @@ -249,6 +271,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService images = dto.getImages(); + for (String image : images) { + if (image.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s = image.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile = new ScmFile(); + scmFile.setAttachType(type); + scmFile.setFileName("盘库见证材料"); + scmFile.setFilePath(s); + scmFile.setLinkSid(scmVehicleInventory.getSid()); + scmFileService.save(scmFile); + } save(scmVehicleInventory); return rb.success().setMsg("保存成功"); } @@ -288,7 +326,22 @@ public class ScmVehicleInventoryService extends MybatisBaseService images = dto.getImages(); + for (String image : images) { + if (image.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { + s = image.replace(fileUploadComponent.getUrlPrefix(), ""); + } + ScmFile scmFile = new ScmFile(); + scmFile.setAttachType(type); + scmFile.setFileName("盘库见证材料"); + scmFile.setFilePath(s); + scmFile.setLinkSid(dto.getSid()); + scmFileService.save(scmFile); + } return rb.success().setMsg("办理成功"); } @@ -299,6 +352,8 @@ public class ScmVehicleInventoryService extends MybatisBaseService images = new ArrayList<>(); AppScmVehicleStayInventoryDetailedsVo vo = baseMapper.getInventoryInfo(recordSid); LastInfo lastInfo = new LastInfo(); ScmVehicleInventory scmVehicleInventory = null; @@ -315,15 +370,20 @@ public class ScmVehicleInventoryService extends MybatisBaseService scmFiles = scmFileService.selectByLinkSid(recordSid, type); + for (ScmFile scmFile : scmFiles) { + images.add(fileUploadComponent.getUrlPrefix() + scmFile.getFilePath()); + } + vo.setImages(images); return vo; } - public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState, String certificateKey, String certificate, String remarks) { + public ResultBean updateState(String sid, String inventoryStateKey, String inventoryState, String remarks) { ResultBean rb = ResultBean.fireFail(); if (inventoryState.equals("不通过") && StringUtils.isBlank(remarks)) { return rb.setMsg("备注请填写不通过原因"); } - baseMapper.updateState(sid, inventoryStateKey, inventoryState, certificateKey, certificate, remarks); + baseMapper.updateState(sid, inventoryStateKey, inventoryState, remarks); return rb.success().setMsg("修改保存成功"); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java index b79ac1ca40..b71e10fdcd 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.java @@ -79,7 +79,7 @@ public interface ScmVehicleStayInventoryMapper extends BaseMapper getInventoryList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw, @Param("names") String names); - List selInventory(@Param("vin") String vin, @Param("id") String id); + List selInventory(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid); @Update("update scm_vehicle_stay_inventory set isDelete = 1,InventoryDate = CURRENT_TIMESTAMP,InventoryName = #{inventoryName} where sid = #{sid}") void delBySid(@Param("sid") String sid, @Param("inventoryName") String inventoryName); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml index f79e827c16..536c212c32 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryMapper.xml @@ -56,6 +56,7 @@ from scm_vehicle_stay_inventory svsi where svsi.mainSid = #{vin} and svsi.id < #{id} + and svsi.createOrgSid = #{useOrgSid} ORDER BY id DESC diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java index 56a489001d..db231fab83 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestayinventory/ScmVehicleStayInventoryService.java @@ -183,7 +183,7 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService records = iPage.getRecords(); for (AppScmVehicleStayInventoryListPageVo record : records) { // 查询上一次的盘库人,盘库时间 - List scmVehicleStayInventoryVos = selInventory(record.getVin(), record.getId()); + List scmVehicleStayInventoryVos = selInventory(record.getVin(), record.getId(), useOrgSid); if (scmVehicleStayInventoryVos.size() <= 0) { record.setInventoryDate("无"); @@ -201,8 +201,8 @@ public class ScmVehicleStayInventoryService extends MybatisBaseService selInventory(String vin, String id) { - return baseMapper.selInventory(vin, id); + public List selInventory(String vin, String id, String useOrgSid) { + return baseMapper.selInventory(vin, id, useOrgSid); } /** diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java index e1098161c0..baa0c6b3b1 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.java @@ -81,7 +81,7 @@ public interface ScmVehicleStayPatrolinspectionMapper extends BaseMapper selPatrolinspection(@Param("vin") String vin, @Param("id") String id); + List selPatrolinspection(@Param("vin") String vin, @Param("id") String id, @Param("useOrgSid") String useOrgSid); @Select("SELECT count(*) FROM scm_vehicle_stay_patrolinspection WHERE createOrgSid = #{useOrgSid} and isDelete = 0 ") int getToDoNum(@Param("useOrgSid") String useOrgSid); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml index 42d1d6c0f5..97a60c1b9a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionMapper.xml @@ -65,6 +65,7 @@ from scm_vehicle_stay_patrolinspection svsp where svsp.mainSid = #{vin} and svsp.id < #{id} + and svsp.createOrgSid = #{useOrgSid} ORDER BY id DESC @@ -77,6 +78,8 @@ - update scm_vehicle_stay_patrolinspection set state = #{state} where sid = #{sid} + update scm_vehicle_stay_patrolinspection + set state = #{state} + where sid = #{sid} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java index c8595c79b6..dbbc874799 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclestaypatrolinspection/ScmVehicleStayPatrolinspectionService.java @@ -172,7 +172,7 @@ public class ScmVehicleStayPatrolinspectionService extends MybatisBaseService iPage = baseMapper.getInventoryList(page, qw, params.getName()); List records = iPage.getRecords(); for (AppScmVehicleStayPatrolinspectionPageVo record : records) { - List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId()); + List scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(),useOrgSid); if (scmVehicleStayPatrolinspectionVos.size() <= 0) { record.setInspectionDate("无"); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java index 94e5bbf4f9..15c8229302 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/AppBusMainDepositFeign.java @@ -83,7 +83,7 @@ public interface AppBusMainDepositFeign { public ResultBean submitVirtualOrderDeposit(@Valid @RequestBody SubmitDepositDto dto); @ApiOperation(value = "办理（同意）（订金收取）") - @PostMapping("/depositComplete") + @PutMapping("/depositComplete") @ResponseBody public ResultBean depositComplete(@Valid @RequestBody DepositCompleteDto query); @@ -107,7 +107,7 @@ public interface AppBusMainDepositFeign { public ResultBean submitVirtualOrderVehicle(@Valid @RequestBody SubmitVehicleDto dto); @ApiOperation(value = "办理（同意）") - @PostMapping("/vehicleComplete") + @PutMapping("/vehicleComplete") @ResponseBody public ResultBean vehicleComplete(@Valid @RequestBody VehicleCompleteDto query); @@ -124,17 +124,17 @@ public interface AppBusMainDepositFeign { ResultBean> getNextNodesForSubmit(@Valid @RequestBody GetNodeQuery query); @ApiOperation(value = "驳回任务") - @PostMapping(value = "/reject") + @PutMapping(value = "/reject") @ResponseBody public ResultBean taskReject(@Valid @RequestBody ScmVirtualOrderTaskQuery query); @ApiOperation(value = "撤回流程") - @PostMapping(value = "/revokeProcess") + @PutMapping(value = "/revokeProcess") @ResponseBody public ResultBean revokeProcess(@Valid @RequestBody ScmVirtualOrderTaskQuery query); @ApiOperation(value = "终止任务") - @PostMapping(value = "/breakProcess") + @PutMapping(value = "/breakProcess") @ResponseBody public ResultBean breakProcess(@Valid @RequestBody ScmVirtualOrderTaskQuery query); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java index 7ef851b444..6f2f432a9b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java @@ -67,4 +67,11 @@ public class DepositBuscenterDetailVo implements Vo { @ApiModelProperty("缴费凭证") private String paymentProof; + + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "流程id") + private String procInsId; + @ApiModelProperty(value = "任务id") + private String taskId; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java index 6c5199cb50..7b96d8ca30 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositCompleteDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,7 +14,6 @@ public class DepositCompleteDto implements Dto { @NotBlank(message = "参数错误：userSid") private String userSid; @ApiModelProperty(value = "用户全路径sid") - @NotBlank(message = "参数错误：orgSidPath") private String orgSidPath; @ApiModelProperty(value = "节点id") @NotBlank(message = "参数错误：taskDefKey") @@ -23,6 +23,7 @@ public class DepositCompleteDto implements Dto { private String taskId; @ApiModelProperty(value = "流程id") @NotBlank(message = "参数错误：instanceId") + @JsonProperty("procInsId") private String instanceId; @ApiModelProperty(value = "意见") private String comment; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/flowable/ScmVirtualOrderTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/flowable/ScmVirtualOrderTaskQuery.java index 5397629f00..b2f22f1449 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/flowable/ScmVirtualOrderTaskQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/flowable/ScmVirtualOrderTaskQuery.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -36,6 +37,7 @@ public class ScmVirtualOrderTaskQuery implements Query { * 终止 */ @ApiModelProperty("流程实例Id") + @JsonProperty("procInsId") private String instanceId; // @ApiModelProperty("节点") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java index 8a9d6d4b45..4450f0f970 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/DepositVehicleDetailVo.java @@ -37,6 +37,13 @@ public class DepositVehicleDetailVo implements Vo { @ApiModelProperty(value = "说明") private String explain; + @ApiModelProperty(value = "用户sid") + private String userSid; + @ApiModelProperty(value = "流程id") + private String procInsId; + @ApiModelProperty(value = "任务id") + private String taskId; + @ApiModelProperty(value = "车辆信息集合") private List vehicleList; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/SubmitVehicleDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/SubmitVehicleDto.java index 8a055a16fb..c31476fabd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/SubmitVehicleDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/SubmitVehicleDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,6 +11,7 @@ public class SubmitVehicleDto extends DepositVehicleDto{ @ApiModelProperty("意见") private String comment; @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") private String instanceId; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java index 3c8568a229..83f3db402d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/vehicle/VehicleCompleteDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -24,6 +25,7 @@ public class VehicleCompleteDto implements Dto { private String taskId; @ApiModelProperty(value = "流程id") @NotBlank(message = "参数错误：instanceId") + @JsonProperty("procInsId") private String instanceId; @ApiModelProperty(value = "意见") private String comment; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java index 49ae86df4d..66ce8e5715 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryDto.java @@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + @Data public class StayInventoryDto implements Dto { @@ -69,4 +71,7 @@ public class StayInventoryDto implements Dto { @JsonProperty(value = "loginSid") private String loginSid; + @ApiModelProperty("见证材料") + private List images; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java index f189ed3e6d..bfd30d4364 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/inventory/StayInventoryInfoVo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: anrui_scm(anrui_scm)
* File: ScmVehicleStayInventoryVo.java
@@ -87,4 +89,7 @@ public class StayInventoryInfoVo implements Vo { @ApiModelProperty("备注") private String remarks; + @ApiModelProperty("见证材料") + private List images; + } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppEnterlibraryPageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppEnterlibraryPageQuery.java index 6c6a20b7a0..4657bc2a5f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppEnterlibraryPageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleenterlibrary/AppEnterlibraryPageQuery.java @@ -16,6 +16,9 @@ public class AppEnterlibraryPageQuery implements Query { @ApiModelProperty("车架号、车型、订单类型") private String names; + @ApiModelProperty("入库时间") + private String date; + @ApiModelProperty("使用组织分公司sid") private String useOrgSid; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java index 2030922e7e..a4e8bdfa45 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehicleexamine/AppExaminePageQuery.java @@ -16,6 +16,15 @@ public class AppExaminePageQuery implements Query { @ApiModelProperty("车架号、车型 、订单类型") private String names; + @ApiModelProperty("验车时间") + private String date; + + @ApiModelProperty("验车开始时间") + private String dateStart; + + @ApiModelProperty("验车结束时间") + private String dateEnd; + @ApiModelProperty("使用组织分公司sid") private String useOrgSid; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java index c5b7ba1996..6dc78971bc 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java @@ -30,20 +30,13 @@ import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.base.api.basevehicle.AppScmWarehouseVinVo; import com.yxt.anrui.base.api.basevehicle.AppVinsDetailsVo; import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign; -import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyDto; -import com.yxt.anrui.buscenter.api.busdeliveredapply.AppDeliveredApplyInfoVo; import com.yxt.anrui.buscenter.api.busdeposit.*; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo; import com.yxt.anrui.buscenter.api.busdepositvehicle.*; import com.yxt.anrui.buscenter.api.busmaindeposit.*; import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusDepositBuscenterDto; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeQuery; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppGetNodeVo; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.AppScmVirtualOrderTaskQuery; -import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.SubmitVirtualOrderDto; -import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; -import com.yxt.anrui.terminal.api.autoservice.retrieval.DeliveredApplyDetailsVo; +import com.yxt.anrui.buscenter.api.busmaindeposit.flowable.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeQuery; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.flowable.GetNodeVo; @@ -52,10 +45,8 @@ import com.yxt.anrui.terminal.api.autoservice.virtualOrders.orders.*; import com.yxt.anrui.terminal.api.autoservice.virtualOrders.vehicle.*; import com.yxt.anrui.terminal.config.CoverUtils; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.query.Query; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.common.core.vo.Vo; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -241,10 +232,14 @@ public class AppBusMainDepositService { * @return */ public ResultBean submitVirtualOrderDeposit(SubmitDepositDto dto) { - SubmitVirtualOrderDto submitVirtualOrderDto = new SubmitVirtualOrderDto(); - BeanUtil.copyProperties(dto, submitVirtualOrderDto); - ResultBean resultBean = busDepositFeign.submitVirtualOrderDeposit(submitVirtualOrderDto); - return resultBean; + ResultBean rb = ResultBean.fireFail(); + SubmitVirtualOrderDepositDto submitVirtualOrderDepositDto = new SubmitVirtualOrderDepositDto(); + BeanUtil.copyProperties(dto, submitVirtualOrderDepositDto); + ResultBean resultBean = busMainDepositFeign.submitVirtualOrderDeposit(submitVirtualOrderDepositDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); } /** @@ -256,7 +251,7 @@ public class AppBusMainDepositService { public ResultBean depositComplete(DepositCompleteDto query) { ScmVirtualOrderDepositCompleteDto scmVirtualOrderDepositCompleteDto = new ScmVirtualOrderDepositCompleteDto(); BeanUtil.copyProperties(query, scmVirtualOrderDepositCompleteDto); - ResultBean resultBean = busDepositFeign.complete(scmVirtualOrderDepositCompleteDto); + ResultBean resultBean = busMainDepositFeign.completeDeposit(scmVirtualOrderDepositCompleteDto); return resultBean; } @@ -320,10 +315,14 @@ public class AppBusMainDepositService { * @return */ public ResultBean submitVirtualOrderVehicle(SubmitVehicleDto dto) { - SubmitVirtualOrderDto submitVirtualOrderDto = new SubmitVirtualOrderDto(); - BeanUtil.copyProperties(dto, submitVirtualOrderDto); - ResultBean resultBean = busDepositVehicleFeign.submitVirtualOrderVehicle(submitVirtualOrderDto); - return resultBean; + ResultBean rb = ResultBean.fireFail(); + SubmitVirtualOrderVehicleDto submitVirtualOrderVehicleDto = new SubmitVirtualOrderVehicleDto(); + BeanUtil.copyProperties(dto, submitVirtualOrderVehicleDto); + ResultBean resultBean = busMainDepositFeign.submitVirtualOrderVehicle(submitVirtualOrderVehicleDto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + return rb.success(); } /** @@ -335,7 +334,7 @@ public class AppBusMainDepositService { public ResultBean vehicleComplete(VehicleCompleteDto query) { ScmVirtualOrderDepositVehicleCompleteDto scmVirtualOrderDepositVehicleCompleteDto = new ScmVirtualOrderDepositVehicleCompleteDto(); BeanUtils.copyProperties(query, scmVirtualOrderDepositVehicleCompleteDto); - ResultBean resultBean = busDepositVehicleFeign.complete(scmVirtualOrderDepositVehicleCompleteDto); + ResultBean resultBean = busMainDepositFeign.completeVehicle(scmVirtualOrderDepositVehicleCompleteDto); return resultBean; }