Merge remote-tracking branch 'origin/master'

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>

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());