|
|
|
|
@ -87,15 +87,14 @@ public class CarAdminServiceImpl extends BaseServiceImpl<CarAdminMapper, CarAdmi |
|
|
|
|
* 分页 车辆信息表 |
|
|
|
|
*/ |
|
|
|
|
@Override |
|
|
|
|
public IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, CarAdmin carAdmin) { |
|
|
|
|
public IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, String name) { |
|
|
|
|
QueryWrapper<CarAdmin> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
if (StringUtils.isNotBlank(carAdmin.getName())) { |
|
|
|
|
queryWrapper.like("name", carAdmin.getName()); |
|
|
|
|
if (StringUtils.isNotBlank(name)) { |
|
|
|
|
queryWrapper.like("name","%"+name+"%"); |
|
|
|
|
} |
|
|
|
|
QueryWrapper<CarAdmin> queryWrapper1 = new QueryWrapper<>(); |
|
|
|
|
queryWrapper1.orderByDesc("create_time"); |
|
|
|
|
queryWrapper.orderByDesc("create_time"); |
|
|
|
|
IPage<CarAdmin> carAdminPage = new Page<>(page.getCurrent(), page.getSize()); |
|
|
|
|
carAdminMapper.selectPage(carAdminPage, queryWrapper1); |
|
|
|
|
carAdminMapper.selectPage(carAdminPage, queryWrapper); |
|
|
|
|
List<CarAdmin> carAdminList = carAdminPage.getRecords(); |
|
|
|
|
List<CarAdminVo> carAdminVoList = new ArrayList<>(); |
|
|
|
|
for (CarAdmin admin : carAdminList) { |
|
|
|
|
|