Commit 52315b1a authored by zhengyi's avatar zhengyi

订单搜索收发货人电话参数改模糊查询

parent 8d659955
...@@ -447,7 +447,7 @@ public class OrderQueryVO { ...@@ -447,7 +447,7 @@ public class OrderQueryVO {
@ApiModelProperty(value = "发货客户联系人IDs") @ApiModelProperty(value = "发货客户联系人IDs")
private Collection<Long> consignorContactsIds; private Collection<Long> consignorContactsIds;
@ApiModelProperty(value = "货人手机号") @ApiModelProperty(value = "货人手机号")
private String consignorPhone; private String consignorPhone;
@ApiModelProperty(value = "收货客户id") @ApiModelProperty(value = "收货客户id")
......
...@@ -2380,14 +2380,13 @@ ...@@ -2380,14 +2380,13 @@
AND nor.`customer_id` = #{query.consignorId} AND nor.`customer_id` = #{query.consignorId}
</if> </if>
<if test="query.consignorPhone != null and query.consignorPhone != '' "> <if test="query.consignorPhone != null and query.consignorPhone != '' ">
AND nor.`phone` = #{query.consignorPhone} AND nor.`phone` like concat("%",concat(#{query.consignorPhone},"%"))
</if> </if>
<if test="query.consigneeId != null "> <if test="query.consigneeId != null ">
AND nee.`customer_id` = #{query.consigneeId} AND nee.`customer_id` = #{query.consigneeId}
</if> </if>
<if test="query.consigneePhone != null and query.consigneePhone != '' "> <if test="query.consigneePhone != null and query.consigneePhone != '' ">
AND nee.`phone` = #{query.consigneePhone} AND nee.`phone` like concat("%",concat(#{query.consigneePhone},"%"))
</if> </if>
<if test="query.isCargoControl != null "> <if test="query.isCargoControl != null ">
AND o.`is_cargo_control` = #{query.isCargoControl} AND o.`is_cargo_control` = #{query.isCargoControl}
...@@ -3237,13 +3236,13 @@ ...@@ -3237,13 +3236,13 @@
AND nor.`customer_id` = #{query.consignorId} AND nor.`customer_id` = #{query.consignorId}
</if> </if>
<if test="query.consignorPhone != null and query.consignorPhone != '' "> <if test="query.consignorPhone != null and query.consignorPhone != '' ">
AND nor.`phone` = #{query.consignorPhone} AND nor.`phone` like concat("%",concat(#{query.consignorPhone},"%"))
</if> </if>
<if test="query.consigneeId != null "> <if test="query.consigneeId != null ">
AND nee.`customer_id` = #{query.consigneeId} AND nee.`customer_id` = #{query.consigneeId}
</if> </if>
<if test="query.consigneePhone != null and query.consigneePhone != '' "> <if test="query.consigneePhone != null and query.consigneePhone != '' ">
AND nee.`phone` = #{query.consigneePhone} AND nee.`phone` like concat("%",concat(#{query.consigneePhone},"%"))
</if> </if>
<if test="query.isCargoControl != null "> <if test="query.isCargoControl != null ">
AND o.`is_cargo_control` = #{query.isCargoControl} AND o.`is_cargo_control` = #{query.isCargoControl}
...@@ -5708,13 +5707,13 @@ ...@@ -5708,13 +5707,13 @@
AND nor.`customer_id` = #{query.consignorId} AND nor.`customer_id` = #{query.consignorId}
</if> </if>
<if test="query.consignorPhone != null and query.consignorPhone != '' "> <if test="query.consignorPhone != null and query.consignorPhone != '' ">
AND nor.`phone` = #{query.consignorPhone} AND nor.`phone` like concat("%",concat(#{query.consignorPhone},"%"))
</if> </if>
<if test="query.consigneeId != null "> <if test="query.consigneeId != null ">
AND nee.`customer_id` = #{query.consigneeId} AND nee.`customer_id` = #{query.consigneeId}
</if> </if>
<if test="query.consigneePhone != null and query.consigneePhone != '' "> <if test="query.consigneePhone != null and query.consigneePhone != '' ">
AND nee.`phone` = #{query.consigneePhone} AND nee.`phone` like concat("%",concat(#{query.consigneePhone},"%"))
</if> </if>
<if test="query.isCargoControl != null "> <if test="query.isCargoControl != null ">
AND o.`is_cargo_control` = #{query.isCargoControl} AND o.`is_cargo_control` = #{query.isCargoControl}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment