From de6f8d223878c012118d3c95e61fc5e382e11034 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Fri, 29 Dec 2023 09:30:20 +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

---
 .../biz/bussalesvehicle/BusSalesVehicleMapper.xml        | 8 ++++----
 .../biz/bussalesvehicle/BusSalesVehicleService.java      | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

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
             <if test="state != null and state != ''">
-                <if test="state == '已交付'">
+                <if test='state == "1"'>
                     and length(bh.closingDate)
-                      >0
+                    >0
                 </if>
-                <if test="state == '未交付'">
+                <if test='state == "0"'>
                     and (bh.closingDate is null
-                     or bh.closingDate = '')
+                    or length(bh.closingDate) =0)
                 </if>
             </if>
         </where>
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());