diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java index 6950842390..30acfdf610 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/PcBaseVehicleOrderQuery.java @@ -10,6 +10,9 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; +import java.util.List; + @Data public class PcBaseVehicleOrderQuery implements Query { private static final long serialVersionUID = 8712247663291062678L; @@ -24,4 +27,7 @@ public class PcBaseVehicleOrderQuery implements Query { private String customerSid; @ApiModelProperty(value = "类型:1意向车型选择、2虚拟订单选择、3车型选择") private Integer type; + + @ApiModelProperty(value = "已选择的车辆的车架号") + private List sidList = new ArrayList<>(); } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 38c040b3b5..f3531596ae 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1177,10 +1177,13 @@ public class BaseVehicleService extends MybatisBaseService> stringList = pcBusMainDepositFeign.selectVehicleList(vehicleQuery); if (stringList.getSuccess()) { - qw.in("bv.sid",stringList.getData()); + qw.in("bv.sid", stringList.getData()); } // qw.eq("bv.lockedState", 1);//车辆的锁定状态为1 } + if (query.getSidList().size() > 0) { + qw.notIn("bv.sid", query.getSidList()); + } } return qw; }