From 35c1c843fc354cb12f0c18f1e29d358d62da0bca Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Tue, 1 Aug 2023 10:10:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=87=BA=E5=BA=93=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/busdeliveredapply/BusDeliveredApplyMapper.xml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
index afeec0dfb4..fcd2ed703b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyMapper.xml
@@ -99,10 +99,11 @@
 
     <select id="selectVinNo" resultType="java.lang.String">
         select RIGHT(bv.linkNo, 8)
-        from bus_delivered bd
-                 left join bus_sales_order_vehicle bv on bv.sid = bd.busVinSid
-        where bd.contractNo = #{contractId}
-          and bd.state = 0
+        from bus_sales_order_vehicle bv
+                 left join bus_sales_order bo on bv.salesOrderSid = bo.sid
+        left join anrui_base.base_vehicle_state bs on bs.busSid = bv.sid
+        where bo.contractNo = #{contractId}
+          and (bs.busState>=402)
           and bv.linkSid in
         <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
             #{item}
@@ -137,7 +138,7 @@
     </select>
 
     <select id="selectNumByContractNo" resultType="int">
-        select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered bd on bd.sid = bddd.applySid
+        select IFNULL(sum(bddd.giveNum),0) from bus_delivered_details_discount bddd left join bus_delivered_apply bd on bd.sid = bddd.applySid
         where contractNo = #{contractId} and (bd.state =2 or bd.state = 3)
     </select>
 </mapper>
\ No newline at end of file