diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java index da818d2c7b..8cfbfd9fff 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java @@ -230,6 +230,8 @@ public class BaseModelModpriceService extends MybatisBaseService vinSidList = busHandoverPrepareVehicleList.stream().map(v->v.getVinSid()).collect(Collectors.toList()); //查询车辆的随车资料是否都已移交 List countList = busVehicleInformationHandoverService.selectByVinSid(vinSidList); + List countList1 = busVehicleInformationHandoverService.selectByVinSid1(vinSidList); + countList1.removeAll(Collections.singleton(null)); + if(countList1.size() != vinSidList.size()){ + return rb.setMsg("车辆中包含随车资料记录为空的车辆,请检查"); + } if(!countList.isEmpty()){ return rb.setMsg("车辆:"+String.join(",",countList)+"随车资料未完成交接"); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java index 0137c7d195..b0ba9e7019 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busvehicleinformationhandover/BusVehicleInformationHandoverMapper.java @@ -26,6 +26,7 @@ public interface BusVehicleInformationHandoverMapper extends BaseMapper selectByVinSid(@Param("list") List vinSidList); + List selectByVinSid1(@Param("list") List vinSidList); IPage selectAppPageVo(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); 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 2e68287e0d..59f8c0f168 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 @@ -57,6 +57,14 @@ #{item} + +