diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java index 627a8f8409..989f847805 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java @@ -535,6 +535,12 @@ public class BusHandoverPrepareService extends MybatisBaseService busHandoverPrepareVehicleList = busHandoverPrepareVehicleService.selectByApplySid(dto.getSid()); busHandoverPrepareVehicleList.removeAll(Collections.singleton(null)); if (!busHandoverPrepareVehicleList.isEmpty()) { + List vinSidList = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList()); + //查询车辆的随车资料是否都已移交 + List countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList); + if(!countList.isEmpty()){ + return rb.setMsg("车辆:"+String.join(",",countList)+"随车资料未完成交接"); + } String sid = dto.getSid(); for (BusHandoverPrepareVehicle handoverPrepareVehicle : busHandoverPrepareVehicleList) { BusHandoverWaitDto busHandoverWaitDto = new BusHandoverWaitDto(); @@ -542,7 +548,7 @@ public class BusHandoverPrepareService extends MybatisBaseService selectByVinSid(@Param("list") List vinSidList); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml index 3cfbc31d32..f2de7fcda9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.xml @@ -45,4 +45,12 @@ from bus_vehicle_information_handover where vehicleSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java index 0ad918ecff..e75ad2b544 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverService.java @@ -500,4 +500,8 @@ public class BusVehicleInformationHandoverService extends MybatisBaseService selectByVinSid(List vinSidList) { + return baseMapper.selectByVinSid(vinSidList); + } } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java index e72ebca555..def61238df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/deliveryPlan/AppBusHandoverPrepareFeign.java @@ -118,7 +118,7 @@ public interface AppBusHandoverPrepareFeign { @ApiOperation("提交交车准备信息") @PostMapping("/submitDeliveryPlanInfo") @ResponseBody - ResultBean submitDeliveryPlanInfo(@RequestBody HandoverPrepareDto dto); + ResultBean submitDeliveryPlanInfo(@SpringQueryMap HandoverPrepareDto dto); @ApiOperation("获取随车资料信息") @GetMapping("/getCarDataInfo")