楚江ERP:要车单-移动端增加搜索条件

@@ -68,4 +68,11 @@ public class QueryRequestCarTicketVo extends PageVo implements BaseVo, Serializa
     @ApiModelProperty("发货单ID")
     @ApiModelProperty("发货单ID")
     private String shipmentsOrderId;
     private String shipmentsOrderId;
 
 
+    /**
+     * 订单编号和客户名称模糊搜索
+     */
+    @ApiModelProperty("搜索条件")
+    private String searchKey;
+
+
 }
 }

@@ -116,6 +116,9 @@
             <if test="vo.shipmentsOrderId != null and vo.shipmentsOrderId != ''">
             <if test="vo.shipmentsOrderId != null and vo.shipmentsOrderId != ''">
                 AND tb.shipments_order_id = #{vo.shipmentsOrderId}
                 AND tb.shipments_order_id = #{vo.shipmentsOrderId}
             </if>
             </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (tb.order_no LIKE CONCAT('%', #{vo.searchKey},'%') OR cu.name LIKE CONCAT('%', #{vo.searchKey},'%'))
+            </if>
         </where>
         </where>
         ORDER BY tb.create_time DESC
         ORDER BY tb.create_time DESC
     </select>
     </select>