| | |
| | | QueryWrapper<CalibrationOrder> queryWrapper = QueryGenerator.initQueryWrapper(calibrationOrder, req.getParameterMap()); |
| | | Page<CalibrationOrder> page = new Page<CalibrationOrder>(pageNo, pageSize); |
| | | IPage<CalibrationOrder> pageList = calibrationOrderService.page(page, queryWrapper); |
| | | for (CalibrationOrder record : pageList.getRecords()) { |
| | | String id = record.getId(); |
| | | String status = record.getStatus(); |
| | | String managementMode = record.getManagementMode(); |
| | | String equipmentId = record.getEquipmentId(); |
| | | Equipment equipment = equipmentService.getById(equipmentId); |
| | | if(equipment != null){ |
| | | record.setEquipmentNum(equipment.getNum()); |
| | | record.setEquipmentName(equipment.getName()); |
| | | record.setEquipmentModel(equipment.getModel()); |
| | | record.setEquipmentSpecification(equipment.getSpecification()); |
| | | } |
| | | List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); |
| | | record.setPrecisionParameterList(precisionParameterList); |
| | | if("4".equals(status)){ |
| | | if("data".equals(managementMode)){ |
| | | List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() |
| | | .eq(CalibrationOrderDetail::getCalibrationOrderId, id) |
| | | .eq(CalibrationOrderDetail::getJudgmentResult, "fail") |
| | | .eq(CalibrationOrderDetail::getDelFlag,"0").list(); |
| | | if(calibrationOrderDetails.size()>0){ |
| | | record.setCalibrationResult("异常"); |
| | | }else{ |
| | | record.setCalibrationResult("正常"); |
| | | } |
| | | }else{ |
| | | List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() |
| | | .eq(CalibrationOrderReport::getCalibrationOrderId, id) |
| | | .eq(CalibrationOrderReport::getJudgmentResult, "fail") |
| | | .eq(CalibrationOrderReport::getDelFlag, "0").list(); |
| | | if(calibrationOrderReports.size()>0){ |
| | | record.setCalibrationResult("异常"); |
| | | }else{ |
| | | record.setCalibrationResult("正常"); |
| | | } |
| | | } |
| | | } |
| | | } |
| | | // for (CalibrationOrder record : pageList.getRecords()) { |
| | | // String id = record.getId(); |
| | | // String status = record.getStatus(); |
| | | // String managementMode = record.getManagementMode(); |
| | | // String equipmentId = record.getEquipmentId(); |
| | | // Equipment equipment = equipmentService.getById(equipmentId); |
| | | // if(equipment != null){ |
| | | // record.setEquipmentNum(equipment.getNum()); |
| | | // record.setEquipmentName(equipment.getName()); |
| | | // record.setEquipmentModel(equipment.getModel()); |
| | | // record.setEquipmentSpecification(equipment.getSpecification()); |
| | | // } |
| | | // List<Map<String, Object>> precisionParameterList = calibrationOrderService.getPrecisionParameterList(equipmentId); |
| | | // record.setPrecisionParameterList(precisionParameterList); |
| | | // if("4".equals(status)){ |
| | | // if("data".equals(managementMode)){ |
| | | // List<CalibrationOrderDetail> calibrationOrderDetails = calibrationOrderDetailService.lambdaQuery() |
| | | // .eq(CalibrationOrderDetail::getCalibrationOrderId, id) |
| | | // .eq(CalibrationOrderDetail::getJudgmentResult, "fail") |
| | | // .eq(CalibrationOrderDetail::getDelFlag,"0").list(); |
| | | // if(calibrationOrderDetails.size()>0){ |
| | | // record.setCalibrationResult("异常"); |
| | | // }else{ |
| | | // record.setCalibrationResult("正常"); |
| | | // } |
| | | // }else{ |
| | | // List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() |
| | | // .eq(CalibrationOrderReport::getCalibrationOrderId, id) |
| | | // .eq(CalibrationOrderReport::getJudgmentResult, "fail") |
| | | // .eq(CalibrationOrderReport::getDelFlag, "0").list(); |
| | | // if(calibrationOrderReports.size()>0){ |
| | | // record.setCalibrationResult("异常"); |
| | | // }else{ |
| | | // record.setCalibrationResult("正常"); |
| | | // } |
| | | // } |
| | | // } |
| | | // } |
| | | return Result.OK(pageList); |
| | | } |
| | | /** |