|
|
|
@ -78,7 +78,13 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
wrapper.eq(StrUtil.isNotEmpty(recycleOrderQuery.getId()), RecycleOrder::getId, recycleOrderQuery.getId());
|
|
|
|
|
Page<RecycleOrder> pageDO = recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime).buildPage();
|
|
|
|
|
// 默认按创建时间倒序、已完成则按结算时间倒序
|
|
|
|
|
if (OrderStatusEnum.FINISHED.equals(recycleOrderQuery.getStatus())) {
|
|
|
|
|
recycleOrderQuery.addOrderItem(RecycleOrder::getCompleteTime, false);
|
|
|
|
|
} else {
|
|
|
|
|
recycleOrderQuery.addOrderItem(RecycleOrder::getCreatorTime, false);
|
|
|
|
|
}
|
|
|
|
|
Page<RecycleOrder> pageDO = recycleOrderQuery.buildPage();
|
|
|
|
|
return page(pageDO, wrapper);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|