订单列表优化

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -276,11 +276,10 @@
                 and b1.no like CONCAT ("%", #{no}, "%")
             </if>
             <if test="startTime != null">
-                and (r.start_time between #{startTime} and #{endTime}
-                or t.start_time between #{startTime} and #{endTime})
+                and o1.start_time between #{startTime} and #{endTime}
             </if>
             <if test="vehicleIds != null and vehicleIds.size() > 0">
-                AND r.vehicle_id IN
+                AND o1.vehicle_id IN
                 <foreach collection="vehicleIds" item="vehicleId" open="(" close=")" separator=",">
                     #{vehicleId}
                 </foreach>
@@ -297,18 +296,18 @@
                 )
             </if>
             <if test="zoneIds != null and zoneIds.size > 0">
-                and (r.start_zone_id in
-                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-                or t.start_zone_id in
+                and (o1.start_zone_id in
                 <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
+<!--                or t.start_zone_id in-->
+<!--                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">-->
+<!--                    #{id}-->
+<!--                </foreach>-->
                 )
             </if>
         </where>
-        order by b.crt_time desc
+        order by b1.crt_time desc
     </select>