From 92763391f40611c2644f309a08f4d2cf5d36f9b9 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Sat, 4 Jan 2025 15:33:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anrui/base/biz/basevehicle/BaseVehicleService.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 5ab8d4b78e..f890ba5243 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 @@ -45,7 +45,6 @@ import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; import com.yxt.anrui.base.common.enums.CertificState; import com.yxt.anrui.base.common.enums.ManPurOrderType; import com.yxt.anrui.base.common.enums.VehicleState; -import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApply; import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.pc.PcBusMainDepositVehicleQuery; @@ -56,7 +55,6 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempDto; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; -import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo; import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign; import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; @@ -3414,7 +3412,13 @@ public class BaseVehicleService extends MybatisBaseService wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode())); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()) + .or().eq("bv.vehicleState", VehicleState.StockEnum.ING_STOCK.getCode()) + .or().eq("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode()) + .or().eq("bv.vehicleState", VehicleState.StockEnum.DC_STOCK.getCode()) + .or().eq("bv.vehicleState", VehicleState.StockEnum.NX_STOCK.getCode()) + .or().eq("bv.vehicleState", VehicleState.StockEnum.DCZ_STOCK.getCode()) + ); } return qw; }