feat(查询): 添加退货审批查询的状态和搜索条件处理
添加handleStatus字段处理不同审批状态组合查询 添加searchStr字段支持订单名称和商品名称模糊搜索
This commit is contained in:
parent
ff811ab6f6
commit
76647e5b95
|
@ -32,11 +32,35 @@ public class SearchReturnApprovalQuery<T> extends AbstractPageQuery<T> {
|
||||||
private Date endTime;
|
private Date endTime;
|
||||||
private String paymentMethod;
|
private String paymentMethod;
|
||||||
private Date approvalTime;
|
private Date approvalTime;
|
||||||
|
private Integer handleStatus;
|
||||||
|
private String searchStr;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public QueryWrapper<T> addQueryCondition() {
|
public QueryWrapper<T> addQueryCondition() {
|
||||||
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
|
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
|
||||||
|
|
||||||
|
if (status == null && handleStatus != null) {
|
||||||
|
if (handleStatus == 0) {
|
||||||
|
queryWrapper.and(wrapper ->
|
||||||
|
wrapper.eq("ra.status", 1)
|
||||||
|
.or()
|
||||||
|
.eq("ra.status", 4));
|
||||||
|
} else if (handleStatus == 1) {
|
||||||
|
queryWrapper.and(wrapper ->
|
||||||
|
wrapper.eq("ra.status", 2)
|
||||||
|
.or()
|
||||||
|
.eq("ra.status", 3));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (StrUtil.isNotEmpty(searchStr)) {
|
||||||
|
queryWrapper.and(wrapper ->
|
||||||
|
wrapper.like("so.name", searchStr)
|
||||||
|
.or()
|
||||||
|
.like("sog.goods_name", searchStr));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
queryWrapper
|
queryWrapper
|
||||||
.eq(approvalId != null, "ra.approval_id", approvalId)
|
.eq(approvalId != null, "ra.approval_id", approvalId)
|
||||||
.eq(orderId != null, "ra.order_id", orderId)
|
.eq(orderId != null, "ra.order_id", orderId)
|
||||||
|
|
Loading…
Reference in New Issue