Merge remote-tracking branch 'origin/master'

Lius

2024-07-25 854856127101ea6cbbc261db46cb06ac141d6ab0

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

@@ -159,6 +159,9 @@
      if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
         queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
      }
      if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
         queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
      }
      queryWrapper.isNull("line_id");
      queryWrapper.eq("status","1");
      queryWrapper.eq("del_flag",0);
@@ -252,6 +255,29 @@
    }


    @ApiOperation(value="mom_eam_equipment-分页列表查询", notes="mom_eam_equipment-分页列表查询")
    @GetMapping(value = "/queryEquipmentList")
    public Result<IPage<Equipment>> queryEquipmentList(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("use_id",equipment.getUseId());
       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);
    }


    /**
     * 设备保修  获取设备列表组件
     * qsw 2023-7-14
@@ -266,6 +292,22 @@
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
       return Result.OK(pageList);
    }

    /**
     * 设备保修  获取设备列表组件
     * qsw 2023-7-14
     */
    @GetMapping(value = "/getEquipmentTZList")
    @PermissionData
    public Result<IPage<Equipment>> getEquipmentTZList(Equipment equipment,
                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                         HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
       return Result.OK(pageList);
    }

@@ -1008,5 +1050,22 @@
       }
       return Result.ok(equipmentListAllStandards);
    }
    @GetMapping(value = "/planEquipmentList")
    @PermissionData
    public Result<IPage<Equipment>> planEquipmentList(Equipment equipment,
                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                         HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
       //根据下次三保时间排序
       queryWrapper.orderByAsc("next_third_maintenance_time");
       //如果startTime和endTime不为空，则查询下次三保时间在这个时间段内的设备
       if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
          queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
       }
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       return Result.OK(pageList);
    }

}