问题项修改

qushaowei

2024-01-12 286375a43369462cd75147271949cf819916912f

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -195,6 +195,55 @@
      return Result.OK(pageList);
   }

    @ApiOperation(value="mom_eam_equipment-分页列表查询", notes="mom_eam_equipment-分页列表查询")
    @GetMapping(value = "/showEquipmentList")
    public Result<IPage<Equipment>> showEquipmentList(Equipment equipment,
                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                       HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
       if(StringUtils.isNotBlank(equipment.getNum())){
          queryWrapper.like("num",equipment.getNum());
       }
       if(StringUtils.isNotBlank(equipment.getName())){
          queryWrapper.like("name",equipment.getName());
       }
       queryWrapper.eq("equipment_status","1");
       queryWrapper.in("technology_status","qualified","limitedUse");
       queryWrapper.eq("status","1");
       queryWrapper.eq("del_flag",0);
       queryWrapper.orderByDesc("create_time");

       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       return Result.OK(pageList);
    }

    @ApiOperation(value="mom_eam_equipment-分页列表查询", notes="mom_eam_equipment-分页列表查询")
    @GetMapping(value = "/findEquipmentList")
    public Result<IPage<Equipment>> findEquipmentList(Equipment equipment,
                                          @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                          @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                          HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
       if(StringUtils.isNotBlank(equipment.getNum())){
          queryWrapper.like("num",equipment.getNum());
       }
       if(StringUtils.isNotBlank(equipment.getName())){
          queryWrapper.like("name",equipment.getName());
       }
       queryWrapper.eq("equipment_status","1");
       queryWrapper.in("technology_status","qualified","limitedUse");
       queryWrapper.in("equipment_importance_id","A","B","C");
       queryWrapper.eq("status","1");
       queryWrapper.eq("del_flag",0);
       queryWrapper.orderByDesc("create_time");

       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       return Result.OK(pageList);
    }


    /**
     * 设备保修  获取设备列表组件