鉴定工单调整

zenglf

2023-10-25 44c045cc308cd16aabeea786e91189470554cc98

鉴定工单调整

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

@@ -452,20 +452,20 @@
        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);
        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()
@@ -489,7 +489,7 @@
//                    }
//                }
//            }
//        }
        }
        return Result.OK(pageList);
    }
    /**