From dacd3c1e9f32edbfe4e0156102ecfc3f747f3297 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 27 Mar 2024 09:49:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E4=BA=A4=E8=BD=A6=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E6=9E=B6=E5=8F=B717=E4=BD=8D?=
 =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusHandoverPrepareVehicleMapper.xml       |  3 +-
 .../bushandoverwait/BusHandoverWaitMapper.xml | 34 +++++++++++--------
 .../BusHandoverWaitService.java               | 14 ++++----
 3 files changed, 28 insertions(+), 23 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 3875efe936..02282bdc54 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
@@ -27,8 +27,7 @@
         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
+        where bhv.mainSid = #{sid}
     </select>
 
     <select id="selectByApplySid"
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
index f5f9972bfb..5327bc35db 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitMapper.xml
@@ -6,7 +6,10 @@
         bh.customerName,
         bh.payTypeValue,
         bh.modelName,
-        bh.payStateValue
+        bh.payStateValue,
+        (select count(*) from bus_handover_wait bw left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
+        where bw.contractNo = bh.contractNo
+        and bw.isDelete = 0 and length(bv.vinNo)>8) as nums
         from bus_handover_wait bh
         <where>
             ${ew.sqlSegment}
@@ -19,28 +22,31 @@
                 , '%')
             </if>
         </where>
-        group by bh.contractNo
+        group by bh.contractNo having nums>0
     </select>
 
     <select id="selectByNo" resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListVo">
-        select vinNo, vinSid,sid
-        from bus_handover_wait
-        where contractNo = #{contractNo}
-          and isDelete = 0
+        select bw.vinNo, bw.vinSid,bw.sid
+        from bus_handover_wait bw
+        left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
+        where bw.contractNo = #{contractNo}
+          and bw.isDelete = 0
     </select>
     <select id="selectListPageVo"
             resultType="com.yxt.anrui.buscenter.api.bushandoverwait.BusHandoverWaitListPageVo">
         select
-        sid,
-        contractNo,
-        customerName,
-        payTypeValue,
-        payStateValue,
-        vinNo,
-        modelName
-        from bus_handover_wait
+        bw.sid,
+        bw.contractNo,
+        bw.customerName,
+        bw.payTypeValue,
+        bw.payStateValue,
+        bw.vinNo,
+        bw.modelName
+        from bus_handover_wait bw
+        left join anrui_base.base_vehicle bv on bv.sid = bw.vinSid
         <where>
             ${ew.sqlSegment}
+            and length(bv.vinNo)>8
         </where>
     </select>
 
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
index 8c7bf06db0..b9ca50e6e6 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverwait/BusHandoverWaitService.java
@@ -85,13 +85,13 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusHandoverWait> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(query.getContractNo())) {
-            qw.like("contractNo", query.getContractNo());
+            qw.like("bw.contractNo", query.getContractNo());
         }
         if (StringUtils.isNotBlank(query.getVinNo())) {
-            qw.like("vinNo", query.getVinNo());
+            qw.like("bw.vinNo", query.getVinNo());
         }
         if (StringUtils.isNotBlank(query.getCustomerName())) {
-            qw.like("customerName", query.getCustomerName());
+            qw.like("bw.customerName", query.getCustomerName());
         }
 //        //查询已提交交车办理车辆
 //        ResultBean<List<BusHandoverItems>> resultBean = busHandoverItemsService.getItemsList();
@@ -103,10 +103,10 @@ public class BusHandoverWaitService extends MybatisBaseService<BusHandoverWaitMa
 //                qw.notIn("vinSid", vinSidList);
 //            }
 //        }
-        qw.eq("createBySid", query.getUserSid());
-        qw.eq("useOrgSid", query.getUseOrgSid());
-        qw.eq("isDelete", 0);
-        qw.orderByDesc("createTime");
+        qw.eq("bw.createBySid", query.getUserSid());
+        qw.eq("bw.useOrgSid", query.getUseOrgSid());
+        qw.eq("bw.isDelete", 0);
+        qw.orderByDesc("bw.createTime");
         return qw;
     }