鉴定工单调整

zenglf

2023-10-25 f2e8dc200f4ec9c1021e908f65e6e1e458c2ef70

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

@@ -62,10 +62,10 @@
   @Autowired
   private IProcessParametersTemplateDetailService processParametersTemplateDetailService;

    @Autowired
   @Autowired
   private IEquipmentProcessParametersService equipmentProcessParametersService;

    @Autowired
   @Autowired
   private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;

    @Autowired
@@ -468,34 +468,34 @@
    @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);
    }

@@ -761,6 +761,17 @@
       }
       return Result.error("文件导入失败！");
    }
    @GetMapping(value = "/getEquipmentStansdardList")
    @PermissionData
    public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
                                         @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                         @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                         HttpServletRequest req) {
       QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
       Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
       IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
       return Result.OK(pageList);
    }


}