| | |
| | | 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; |
| | |
| | | } |
| | | 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); |
| | | } |
| | | |
| | | /** |
| | | * 添加 |
| | |
| | | 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("维护成功"); |
| | | } |
| | | |
| | | } |