|
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
|
|
+import java.util.Date;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -39,7 +40,8 @@ public class DreMenuServiceImpl extends ServiceImpl<DreMenuMapper, DreMenu> impl
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public CommonPage<DreMenu> page(Integer current, Integer size, String type, String name, Integer isRecommend, Integer status) {
|
|
|
|
|
|
+ public CommonPage<DreMenu> page(Integer current, Integer size, String type, String name, Integer isRecommend, Integer status, Date startTime ,
|
|
|
|
+ Date endTime) {
|
|
IPage<DreMenu> page = new Page<>(current, size);
|
|
IPage<DreMenu> page = new Page<>(current, size);
|
|
QueryWrapper<DreMenu> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<DreMenu> queryWrapper = new QueryWrapper<>();
|
|
queryWrapper.orderByAsc(" field(type,'早餐','午餐','晚餐','宵夜')");
|
|
queryWrapper.orderByAsc(" field(type,'早餐','午餐','晚餐','宵夜')");
|
|
@@ -49,6 +51,7 @@ public class DreMenuServiceImpl extends ServiceImpl<DreMenuMapper, DreMenu> impl
|
|
.like(StringUtils.isNotBlank(name),DreMenu::getName,name)
|
|
.like(StringUtils.isNotBlank(name),DreMenu::getName,name)
|
|
.eq(null != isRecommend,DreMenu::getIsRecommend,isRecommend)
|
|
.eq(null != isRecommend,DreMenu::getIsRecommend,isRecommend)
|
|
.eq(null != status,DreMenu::getStatus,status)
|
|
.eq(null != status,DreMenu::getStatus,status)
|
|
|
|
+ .between(null != startTime && null != endTime,DreMenu::getCreateTime,startTime,endTime)
|
|
.orderByDesc(DreMenu::getId);
|
|
.orderByDesc(DreMenu::getId);
|
|
page = this.page(page,queryWrapper);
|
|
page = this.page(page,queryWrapper);
|
|
return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
|
|
return new CommonPage<>(page.getRecords(),page.getTotal(),page.getCurrent(),page.getSize());
|