|
|
@@ -85,7 +85,8 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
|
|
|
.eq(ReservePlan::getEnable, 1)
|
|
|
.eq(ReservePlan::getCreator, SecurityUtils.getUsername())
|
|
|
.like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
|
|
|
- .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate);
|
|
|
+ .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate)
|
|
|
+ .orderByDesc(ReservePlan::getId);
|
|
|
page = this.page(page, queryWrapper);
|
|
|
if (CollectionUtils.isNotEmpty(page.getRecords())) {
|
|
|
for (int i = 0; i < page.getRecords().size(); i++) {
|
