From 44c045cc308cd16aabeea786e91189470554cc98 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期三, 25 十月 2023 13:21:39 +0800
Subject: [PATCH] 鉴定工单调整
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 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..43afffa 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,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);
}
/**
--
Gitblit v1.9.3