修改代码模糊查询

master
chents 3 years ago
parent 4be3386bbc
commit b2d1eb1128
  1. 4
      src/main/java/org/springblade/modules/business/controller/CarAdminController.java
  2. 2
      src/main/java/org/springblade/modules/business/service/ICarAdminService.java
  3. 11
      src/main/java/org/springblade/modules/business/service/impl/CarAdminServiceImpl.java
  4. 1
      src/main/java/org/springblade/modules/business/vo/CarAdminVo.java

@ -132,8 +132,8 @@ public class CarAdminController extends BladeController {
@GetMapping("/list")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "分页", notes = "传入carAdmin和query")
public R<IPage<CarAdminVo>> list(CarAdmin carAdmin, Query query) {
IPage<CarAdminVo> pages = carService.selectCarAdminPage(Condition.getPage(query), carAdmin);
public R<IPage<CarAdminVo>> list(@RequestParam(required = false) String name, Query query) {
IPage<CarAdminVo> pages = carService.selectCarAdminPage(Condition.getPage(query), name);
return R.data(pages);
}

@ -21,6 +21,6 @@ public interface ICarAdminService extends BaseService<CarAdmin> {
boolean delete(String ids);
IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, CarAdmin carAdmin);
IPage<CarAdminVo> selectCarAdminPage(IPage<Object> page, String name);
}

@ -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) {

@ -2,6 +2,7 @@ package org.springblade.modules.business.vo;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;

Loading…
Cancel
Save