小修改

qushaowei

2024-07-25 a7ecb4b14c2e5a56f425f46decc9c203580edd35

 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);
@@ -215,7 +218,7 @@
       if(StringUtils.isNotBlank(equipment.getName())){
          queryWrapper.like("name",equipment.getName());
       }
       queryWrapper.eq("equipment_status","1");
//       queryWrapper.eq("equipment_status","1");
       queryWrapper.in("technology_status","qualified","limitedUse");
       queryWrapper.eq("status","1");
       queryWrapper.eq("del_flag",0);
@@ -239,7 +242,7 @@
       if(StringUtils.isNotBlank(equipment.getName())){
          queryWrapper.like("name",equipment.getName());
       }
       queryWrapper.eq("equipment_status","1");
//       queryWrapper.eq("equipment_status","1");
       queryWrapper.in("technology_status","qualified","limitedUse");
       queryWrapper.in("equipment_importance_id","A","B","C");
       queryWrapper.eq("status","1");
@@ -292,6 +295,22 @@
       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);
    }

    @GetMapping(value = "/pageEquipment")
    public Result<IPage<Equipment>> pageEquipment(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) {
       IPage<Equipment> pageList = equipmentService.pageEquipment(pageNo, pageSize, params);