Commit 991a9b39 authored by honghy's avatar honghy Committed by wux

需求43 订单列表新增查询条件-付款人

parent 4cb06535
......@@ -658,6 +658,9 @@ public class OrderQueryVO {
@ApiModelProperty(value = "动态查询审核类型(字典 order_approval_type) 0 为正常")
private List<Integer> dynamicAuditTypeList;
@ApiModelProperty(value = "付款人: 1 发货人 2 收货人 3 自定义")
private List<Integer> draweeList;
// @ApiModelProperty(value = "动态查询订单异常状态(字典 order_abnormal_state)")
// private List<Integer> dynamicAbnormalStateList;
//
......
......@@ -1831,6 +1831,12 @@
<sql id="myOrderQuery">
<include refid="dynamicQuery"/>
<if test="query.draweeList != null and query.draweeList.size()>0 ">
AND o.drawee in
<foreach item='item' index="index" collection='query.draweeList' open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="query.packageType != null and query.packageType != '' ">
AND CONCAT(',',o.package_type,',') REGEXP CONCAT(',',REPLACE(#{query.packageType},',',',|,'), ',')
</if>
......@@ -2628,6 +2634,12 @@
<sql id="orderQuery">
<include refid="dynamicQuery"/>
<if test="query.draweeList != null and query.draweeList.size()>0 ">
AND o.drawee in
<foreach item='item' index="index" collection='query.draweeList' open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="query.packageType != null and query.packageType != '' ">
AND CONCAT(',',o.package_type,',') REGEXP CONCAT(',',REPLACE(#{query.packageType},',',',|,'), ',')
</if>
......
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