| | |
|---|
| | | @GetMapping(value = "/getResumeCalibrationRecordList") |
|---|
| | | public Result<?> getResumeCalibrationRecordList(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, @RequestParam Map<String, Object> params) { |
|---|
| | | IPage<Map<String, Object>> resumeCalibrationRecordList = equipmentService.getResumeCalibrationRecordList(pageNo, pageSize, params); |
|---|
| | | for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) { |
|---|
| | | String id = (String)record.get("id"); |
|---|
| | | String status = (String)record.get("status"); |
|---|
| | | String managementMode = (String)record.get("managementMode"); |
|---|
| | | 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.put("calibrationResult","异常"); |
|---|
| | | }else{ |
|---|
| | | record.put("calibrationResult","正常常"); |
|---|
| | | } |
|---|
| | | }else{ |
|---|
| | | List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() |
|---|
| | | .eq(CalibrationOrderReport::getCalibrationOrderId, id) |
|---|
| | | .eq(CalibrationOrderReport::getJudgmentResult, "fail") |
|---|
| | | .eq(CalibrationOrderReport::getDelFlag, "0").list(); |
|---|
| | | if(calibrationOrderReports.size()>0){ |
|---|
| | | record.put("calibrationResult","异常"); |
|---|
| | | }else{ |
|---|
| | | record.put("calibrationResult","正常常"); |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | } |
|---|
| | | // for (Map<String, Object> record : resumeCalibrationRecordList.getRecords()) { |
|---|
| | | // String id = (String)record.get("id"); |
|---|
| | | // String status = (String)record.get("status"); |
|---|
| | | // String managementMode = (String)record.get("managementMode"); |
|---|
| | | // 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.put("calibrationResult","异常"); |
|---|
| | | // }else{ |
|---|
| | | // record.put("calibrationResult","正常常"); |
|---|
| | | // } |
|---|
| | | // }else{ |
|---|
| | | // List<CalibrationOrderReport> calibrationOrderReports = calibrationOrderReportService.lambdaQuery() |
|---|
| | | // .eq(CalibrationOrderReport::getCalibrationOrderId, id) |
|---|
| | | // .eq(CalibrationOrderReport::getJudgmentResult, "fail") |
|---|
| | | // .eq(CalibrationOrderReport::getDelFlag, "0").list(); |
|---|
| | | // if(calibrationOrderReports.size()>0){ |
|---|
| | | // record.put("calibrationResult","异常"); |
|---|
| | | // }else{ |
|---|
| | | // record.put("calibrationResult","正常常"); |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | // } |
|---|
| | | return Result.ok(resumeCalibrationRecordList); |
|---|
| | | } |
|---|
| | | |
|---|
