|
|
@@ -2,23 +2,19 @@ package com.usky.dxtop.service.impl;
|
|
|
|
|
|
import cn.afterturn.easypoi.excel.ExcelImportUtil;
|
|
|
import cn.afterturn.easypoi.excel.entity.ImportParams;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.usky.dxtop.common.core.page.CommonPage;
|
|
|
import com.usky.dxtop.common.exception.CustomException;
|
|
|
import com.usky.dxtop.common.utils.BeanMapperUtils;
|
|
|
import com.usky.dxtop.common.utils.StringUtils;
|
|
|
-import com.usky.dxtop.model.Company;
|
|
|
-import com.usky.dxtop.model.DreMenu;
|
|
|
import com.usky.dxtop.mapper.DreMenuMapper;
|
|
|
-import com.usky.dxtop.model.Order;
|
|
|
+import com.usky.dxtop.model.DreMenu;
|
|
|
import com.usky.dxtop.service.DreMenuService;
|
|
|
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.usky.dxtop.service.vo.DreMenuFileVO;
|
|
|
-import com.usky.dxtop.service.vo.OrderFileVO;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
@@ -45,8 +41,10 @@ public class DreMenuServiceImpl extends ServiceImpl<DreMenuMapper, DreMenu> impl
|
|
|
@Override
|
|
|
public CommonPage<DreMenu> page(Integer current, Integer size, String type, String name, Integer isRecommend, Integer status) {
|
|
|
IPage<DreMenu> page = new Page<>(current, size);
|
|
|
- LambdaQueryWrapper<DreMenu> queryWrapper = Wrappers.lambdaQuery();
|
|
|
+ QueryWrapper<DreMenu> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.orderByAsc(" field(type,'早餐','午餐','晚餐','宵夜')");
|
|
|
queryWrapper
|
|
|
+ .lambda()
|
|
|
.eq(StringUtils.isNotBlank(type),DreMenu::getType,type)
|
|
|
.like(StringUtils.isNotBlank(name),DreMenu::getName,name)
|
|
|
.eq(null != isRecommend,DreMenu::getIsRecommend,isRecommend)
|
