Commit f13fcab9 by huluobin

已删除过滤

parent f14cd636
...@@ -383,6 +383,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order ...@@ -383,6 +383,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
if (param.getShowUnCheck() != null && !param.getShowUnCheck()) { if (param.getShowUnCheck() != null && !param.getShowUnCheck()) {
wrapper.ne(OrderManage::getStatus, OrderManage.STATUS_SYSTEM_UN_CHECK); wrapper.ne(OrderManage::getStatus, OrderManage.STATUS_SYSTEM_UN_CHECK);
} }
wrapper.ne(OrderManage::getStatus, OrderManage.STATUS_DELETED);
//noinspection unchecked //noinspection unchecked
wrapper.orderByDesc(OrderManage::getCreateTime); wrapper.orderByDesc(OrderManage::getCreateTime);
......
...@@ -1063,6 +1063,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -1063,6 +1063,8 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
wrapper.like(ScheduleManage::getTelephone, qry.getPhone()); wrapper.like(ScheduleManage::getTelephone, qry.getPhone());
} }
wrapper.ne(ScheduleManage::getStatus, ScheduleManage.STATUS_DELETED);
//已预约 服务中 //已预约 服务中
if (Lists.newArrayList(1, 8).contains(qry.getStatus())) { if (Lists.newArrayList(1, 8).contains(qry.getStatus())) {
wrapper.orderByAsc(ScheduleManage::getArriveTime); wrapper.orderByAsc(ScheduleManage::getArriveTime);
......
...@@ -37,6 +37,9 @@ public class ScheduleManage implements Serializable { ...@@ -37,6 +37,9 @@ public class ScheduleManage implements Serializable {
public static final Integer STATUS_MISS_SCHEDULED = 3; public static final Integer STATUS_MISS_SCHEDULED = 3;
//取消预约 //取消预约
public static final Integer STATUS_CANCEL_SCHEDULED = 4; public static final Integer STATUS_CANCEL_SCHEDULED = 4;
public static final Integer STATUS_DELETED = 5;
//服务中 //服务中
public static final Integer STATUS_SERVING = 8; public static final Integer STATUS_SERVING = 8;
//用户端预约 //用户端预约
......
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