From 7edea520da2deb797df00dd5a5e7d376d96565b9 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 22 Dec 2023 14:57:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java   | 2 +-
 .../buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml   | 4 ++--
 .../buscenter/biz/bussalesvehicle/BusSalesVehicleService.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java
index bf9f11f4b6..39525bd89b 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicle/BusSalesVehicleQuery.java
@@ -33,7 +33,7 @@ public class BusSalesVehicleQuery implements Query {
     private String saleDateStart;
     @ApiModelProperty("销售日期结束")
     private String saleDateEnd;
-    @ApiModelProperty("交付状态")
+    @ApiModelProperty("交付状态:1已交付，0未交付")
     private String handoverState;
 
     @ApiModelProperty("交付日期开始")
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 335d0cf494..c0572b0a8f 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
@@ -32,11 +32,11 @@
                 >
                   0
             <if test="state != null and state != ''">
-                <if test="state == '已交付'">
+                <if test='state == "1"'>
                     and length(bh.closingDate)
                       >0
                 </if>
-                <if test="state == '未交付'">
+                <if test='state == "0"'>
                     and (bh.closingDate is null
                      or bh.closingDate = '')
                 </if>
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 7992f6b950..bd6402f12d 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
@@ -58,7 +58,7 @@ public class BusSalesVehicleService {
                 qw.like("bvoa.contractNo", query.getContractNo());
             }
             if (StringUtils.isNotBlank(query.getSaleType())) {
-                qw.like("bvoa.saleTypeValue", query.getSaleType());
+                qw.eq("bvoa.saleTypeKey", query.getSaleType());
             }
             if (StringUtils.isNotBlank(query.getVinNo())) {
                 qw.like("bv.vinNo", query.getVinNo());