diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java index 6f44c81..44e2b84 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/shop/approval/query/SearchApiReturnApprovalQuery.java @@ -16,6 +16,9 @@ public class SearchApiReturnApprovalQuery extends AbstractPageQuery { private Long goodsId; private String goodsName; private Integer status; + // 0:未处理 1:已处理 + private Integer handleStatus; + private String searchStr; private Long externalGoodsId; private Long externalApprovalId; private String code; @@ -36,6 +39,20 @@ public class SearchApiReturnApprovalQuery extends AbstractPageQuery { public QueryWrapper addQueryCondition() { QueryWrapper 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)); + } + } + queryWrapper .eq(approvalId != null, "ra.approval_id", approvalId) .eq(orderId != null, "ra.order_id", orderId) @@ -51,8 +68,16 @@ public class SearchApiReturnApprovalQuery extends AbstractPageQuery { .eq(StrUtil.isNotEmpty(applyUserName), "ra.apply_user_name", applyUserName) .eq(StrUtil.isNotEmpty(auditUserid), "ra.audit_userid", auditUserid) .like(StrUtil.isNotEmpty(goodsName), "sog.goods_name", goodsName) - .between(startTime != null && endTime != null, "ra.create_time", startTime, endTime) - .orderByDesc("ra.approval_id"); + .between(startTime != null && endTime != null, "ra.create_time", startTime, endTime); + + if (StrUtil.isNotEmpty(searchStr)) { + queryWrapper.and(wrapper -> + wrapper.like("so.name", searchStr) + .or() + .like("sog.goods_name", searchStr)); + } + + queryWrapper.orderByDesc("ra.approval_id"); this.timeRangeColumn = "create_time";