From 2ffba6ed844b5a21a3f839fe77ce9a0466458a19 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期一, 27 十一月 2023 11:35:07 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index adc8d65..67eaa4a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -452,18 +452,18 @@
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());
-// }
+ 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)){
@@ -489,7 +489,7 @@
// }
// }
// }
-// }
+ }
return Result.OK(pageList);
}
/**
--
Gitblit v1.9.3