|
@@ -66,7 +66,12 @@ public class EnergyItemController extends JeecgController<EnergyItem, IEnergyIte
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
- QueryWrapper<EnergyItem> queryWrapper = QueryGenerator.initQueryWrapper(energyItem, req.getParameterMap());
|
|
|
|
|
|
+ EnergyItem energyItem1 = new EnergyItem();
|
|
|
|
+ energyItem1.setEnergytypeid(energyItem.getEnergytypeid());
|
|
|
|
+ QueryWrapper<EnergyItem> queryWrapper = QueryGenerator.initQueryWrapper(energyItem1, req.getParameterMap());
|
|
|
|
+ queryWrapper.like(energyItem.getEnergyitemname()!=null && !energyItem.getEnergyitemname().equals(""), "energyitemname",energyItem.getEnergyitemname());
|
|
|
|
+ queryWrapper.like(energyItem.getRemark()!=null && !energyItem.getRemark().equals(""), "energyitemname",energyItem.getRemark());
|
|
|
|
+ queryWrapper.orderByDesc("create_time");
|
|
Page<EnergyItem> page = new Page<EnergyItem>(pageNo, pageSize);
|
|
Page<EnergyItem> page = new Page<EnergyItem>(pageNo, pageSize);
|
|
IPage<EnergyItem> pageList = energyItemService.page(page, queryWrapper);
|
|
IPage<EnergyItem> pageList = energyItemService.page(page, queryWrapper);
|
|
return Result.OK(pageList);
|
|
return Result.OK(pageList);
|