Commit a5103e4c authored by srx's avatar srx

模糊筛选修改

parent b3c8bb10
...@@ -176,6 +176,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E ...@@ -176,6 +176,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
// BeanUtils.copyProperties(attachmentDto,attachment); // BeanUtils.copyProperties(attachmentDto,attachment);
} }
//设备模糊筛选
public Page<EquipmentDto> queryEquipmentPage(int current, int size, Equipment equipment) { public Page<EquipmentDto> queryEquipmentPage(int current, int size, Equipment equipment) {
Page<EquipmentDto> page = new Page<>(); Page<EquipmentDto> page = new Page<>();
page.setSize(size); page.setSize(size);
...@@ -183,16 +184,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E ...@@ -183,16 +184,7 @@ public class EquipmentServiceImpl extends BaseService<EquipmentDto, Equipment, E
this.list(); this.list();
List<EquipmentDto> equipments = equipmentMapper.queryEquipmentPage(equipment); List<EquipmentDto> equipments = equipmentMapper.queryEquipmentPage(equipment);
// List<CompanyDto> companyDtos = new ArrayList<>();
// BeanUtils.copyProperties(companies,companyDtos);
page.setRecords(equipments); page.setRecords(equipments);
// if (companyDto.getName() != null) {
// List<CompanyDto> collect = page1.getRecords().stream().filter(a -> a.getName().equals(companyDto.getName())).collect(Collectors.toList());
// page1.setRecords(collect);
// }
return page; return page;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment