12/8
This commit is contained in:
@@ -12,6 +12,6 @@ public class LpkReserveOrderQuery implements Query {
|
|||||||
private String userName; //用户名
|
private String userName; //用户名
|
||||||
private String store; // 门店
|
private String store; // 门店
|
||||||
private String startDate; //预约开始日期
|
private String startDate; //预约开始日期
|
||||||
// private String endDate; // 预约结束日期
|
private String endDate; // 预约结束日期
|
||||||
private String userSid;
|
private String userSid;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,11 +88,20 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
|
|||||||
if (StringUtils.isNotBlank(query.getUserName())) {
|
if (StringUtils.isNotBlank(query.getUserName())) {
|
||||||
qw.like("o.userName", query.getUserName());
|
qw.like("o.userName", query.getUserName());
|
||||||
}
|
}
|
||||||
|
if (StringUtils.isNotBlank(query.getUserSid())) {
|
||||||
|
qw.like("o.customerSid", query.getUserSid());
|
||||||
|
}
|
||||||
|
if (StringUtils.isNotBlank(query.getStartDate())) {
|
||||||
|
|
||||||
String startDate = query.getStartDate();
|
String startDate = query.getStartDate();
|
||||||
// String endDate = query.getEndDate();
|
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')");
|
||||||
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
|
}
|
||||||
apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + startDate + "','%Y-%m-%d')"
|
if (StringUtils.isNotBlank(query.getEndDate())) {
|
||||||
);
|
String endDate = query.getEndDate();
|
||||||
|
qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(endDate), "date_format (o.reserveDate,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')");
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
qw.orderByDesc("o.createTime");
|
qw.orderByDesc("o.createTime");
|
||||||
IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
|
IPage<LpkReserveOrder> page = PagerUtil.queryToPage(pq);
|
||||||
IPage<LpkReserveOrderVo> pagging = baseMapper.orderList(page, qw);
|
IPage<LpkReserveOrderVo> pagging = baseMapper.orderList(page, qw);
|
||||||
|
|||||||
Reference in New Issue
Block a user