From 472b1de26e977351124d5553e32d39e5c14040d3 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 27 Mar 2024 09:32:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E4=BA=A4=E8=BD=A6=E5=87=86=E5=A4=87?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=B8=AD=E8=BD=A6=E6=9E=B6=E5=8F=B717?=
 =?UTF-8?q?=E4=BD=8D=E7=9A=84=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusHandoverPrepareVehicleMapper.xml       | 30 ++++++++-----------
 .../BusHandoverPrepareVehicleService.java     | 22 --------------
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml
index 7bfedc2668..3875efe936 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleMapper.xml
@@ -16,23 +16,19 @@
     </select>
     <select id="selByMainSid"
             resultType="com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleInfoVo">
-        select sid,
-               mainSid,
-               vinNo,
-        vinSid,
-              <!-- invoicingState   as invoicingStateb,
-               certificateState as certificateStateb,
-               policyState      as policyStateb,
-               onBoardDataState as onBoardDataStateb,
-               otherDataState   as otherDataStateb,-->
-        invoicingState ,
-        certificateState,
-        policyState,
-        onBoardDataState,
-        otherDataState,
-        remarks
-        from bus_handover_prepare_vehicle
-        where mainSid = #{sid}
+        select bhv.sid,
+        bhv.mainSid,
+        bhv.vinNo,
+        bhv.vinSid,
+        bhv.invoicingState ,
+        bhv.certificateState,
+        bhv.policyState,
+        bhv.onBoardDataState,
+        bhv.otherDataState,
+        bhv.remarks
+        from bus_handover_prepare_vehicle bhv
+        left join anrui_base.base_vehicle bv on bv.sid = bhv.vinSid
+        where mainSid = #{sid} and length(bv.vinNo)>8
     </select>
 
     <select id="selectByApplySid"
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
index 5f77bd6681..ac1372ddb7 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverpreparevehicle/BusHandoverPrepareVehicleService.java
@@ -183,28 +183,6 @@ public class BusHandoverPrepareVehicleService extends MybatisBaseService<BusHand
         return list;
     }
 
-   /* public void saveState(AppStateDateDto dto) {
-        String sid = dto.getSid();
-        String key = dto.getKey();
-        String vin = dto.getVin();
-        if ("01".equals(key)) {
-            baseMapper.saveInvoiceState(sid, vin);
-        }
-        if ("02".equals(key)) {
-            baseMapper.saveCertificateState(sid, vin);
-        }
-        if ("03".equals(key)) {
-            baseMapper.savePolicyState(sid, vin);
-        }
-        if ("04".equals(key)) {
-            baseMapper.saveOnBoardState(sid, vin);
-        }
-        if ("05".equals(key)) {
-            baseMapper.saveOtherDataState(sid, vin);
-        }
-
-    }*/
-
     public void deleteByMainSid(String sid) {
         baseMapper.deleteByMainSid(sid);
     }