diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml index 113ab6b2b4..95f66f8deb 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml @@ -79,13 +79,13 @@ ${ew.sqlSegment} and length(bv.salesDate) > 0 - + and length(bh.closingDate) - >0 + >0 - + and (bh.closingDate is null - or bh.closingDate = '') + or length(bh.closingDate) =0) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java index f06d576113..186a96d987 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleService.java @@ -146,8 +146,15 @@ public class BusSalesVehicleService { if (StringUtils.isNotBlank(query.getContractNo())) { qw.like("bvoa.contractNo", query.getContractNo()); } - if (StringUtils.isNotBlank(query.getSaleType())) { + /*if (StringUtils.isNotBlank(query.getSaleType())) { qw.like("bvoa.saleTypeValue", query.getSaleType()); + }*/ + if (StringUtils.isNotBlank(query.getSaleType())) { + if("1".equals(query.getSaleType())){ + qw.eq("bvoa.saleTypeKey", "001"); + }else if("2".equals(query.getSaleType())){ + qw.eq("bvoa.saleTypeKey", "002"); + } } if (StringUtils.isNotBlank(query.getVinNo())) { qw.like("bv.vinNo", query.getVinNo());