设备台账字段增加查询条件增加

“linengliang”

2023-09-06 8b825a12d64065dd9d8054e5247e374f6cec5390

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

@@ -15,6 +15,7 @@
import org.jeecg.common.util.oConvertUtils;
//import org.jeecg.modules.base.entity.Unit;
//import org.jeecg.modules.base.service.IUnitService;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentPrecisionParameters;
import org.jeecg.modules.eam.entity.PrecisionParameters;
import org.jeecg.modules.eam.service.IEquipmentPrecisionParametersService;
@@ -93,7 +94,40 @@
      }
      return Result.OK(pageList);
   }
	

    /**
     * 分页列表查询
     *
     * @param equipmentPrecisionParameters
     * @param pageNo
     * @param pageSize
     * @param req
     * @return
     */
    //@AutoLog(value = "mom_eam_equipment_precision_parameters-分页列表查询")
    @ApiOperation(value="mom_eam_equipment_precision_parameters-分页列表查询", notes="mom_eam_equipment_precision_parameters-分页列表查询")
    @GetMapping(value = "/getByEquipmentId")
    public Result<IPage<EquipmentPrecisionParameters>> getByEquipmentId(EquipmentPrecisionParameters equipmentPrecisionParameters,
                                                     @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                                     @RequestParam(name="pageSize", defaultValue="100") Integer pageSize,
                                                     HttpServletRequest req) {
       QueryWrapper<EquipmentPrecisionParameters> queryWrapper = QueryGenerator.initQueryWrapper(equipmentPrecisionParameters, req.getParameterMap());
       Page<EquipmentPrecisionParameters> page = new Page<EquipmentPrecisionParameters>(pageNo, pageSize);
       IPage<EquipmentPrecisionParameters> pageList = equipmentPrecisionParametersService.page(page, queryWrapper);
       for (EquipmentPrecisionParameters parameters : pageList.getRecords()) {
          String precisionParametersId = parameters.getPrecisionParametersId();
          PrecisionParameters precisionParameters = precisionParametersService.getById(precisionParametersId);
          if(precisionParameters != null){
             parameters.setPrecisionParametersNum(precisionParameters.getNum());
             parameters.setPrecisionParametersName(precisionParameters.getName());
          }
          String upperLimit = parameters.getUpperLimit()+"";
          String lowerLimit = parameters.getLowerLimit()+"";
          parameters.setTolerance("["+upperLimit+"—"+lowerLimit+"]");
       }
       return Result.OK(pageList);
    }

   /**
    *   添加
    *
@@ -116,7 +150,7 @@
      }
      return Result.OK("添加成功！");
   }
	

   /**
    *  编辑
    *
@@ -131,7 +165,7 @@
      equipmentPrecisionParametersService.updateById(equipmentPrecisionParameters);
      return Result.OK("编辑成功!");
   }
	

   /**
    *   通过id删除
    *
@@ -146,7 +180,7 @@
      equipmentPrecisionParametersService.removeById(id);
      return Result.OK("删除成功!");
   }
	

   /**
    *  批量删除
    *
@@ -161,7 +195,7 @@
      this.equipmentPrecisionParametersService.removeByIds(Arrays.asList(ids.split(",")));
      return Result.OK("批量删除成功!");
   }
	

   /**
    * 通过id查询
    *
@@ -204,4 +238,16 @@
        return super.importExcel(request, response, EquipmentPrecisionParameters.class);
    }

    @PutMapping("/submitBatch")
    public Result<?> submitBatch(@RequestBody List<EquipmentPrecisionParameters> equipmentPrecisionParameters){
      equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
       return Result.OK("提交成功");
   }
    @PutMapping("newEdit")
    public Result<?> newEdit(@RequestBody Equipment equipment){
       List<EquipmentPrecisionParameters> equipmentPrecisionParameters = equipment.getPrecisionEditTableList();
       equipmentPrecisionParametersService.saveOrUpdateBatch(equipmentPrecisionParameters);
       return Result.OK("维护成功");
    }

}