From 3363cc541bf40b48269950e1f6e6c87eec4603e6 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期六, 18 十一月 2023 21:42:38 +0800
Subject: [PATCH] 细节修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
index c37f1dd..9af40e8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/RepairOrderController.java
@@ -121,28 +121,28 @@
HttpServletRequest req) {
Page<RepairOrder> page = new Page<RepairOrder>(pageNo, pageSize);
IPage<RepairOrder> pageList = repairOrderService.getRepairOrderList(page, repairOrder);
- for(RepairOrder repairOrder1 : pageList.getRecords()){
- if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
- EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
- repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
- }
- if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
- ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
- repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
- }
-
- String id = repairOrder1.getId();
- QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
- wrapper.eq("repair_order_id", id)
- .eq("del_flag", 0);
- wrapper.select("sum(actual_hour) as actualHour");
- Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
- BigDecimal actualHour = new BigDecimal(0);
- if (map != null) {
- actualHour = (BigDecimal) map.get("actualHour");
- }
- repairOrder1.setActualHour(actualHour);
- }
+// for(RepairOrder repairOrder1 : pageList.getRecords()){
+// if(StringUtils.isNotBlank(repairOrder1.getReportRepairId())){
+// EquipmentReportRepair equipmentReportRepair = equipmentReportRepairService.getById(repairOrder1.getReportRepairId());
+// repairOrder1.setReportRepairNum(equipmentReportRepair.getNum());
+// }
+// if(StringUtils.isNotBlank(repairOrder1.getProjectMaintenanceOrderId())){
+// ProjectMaintenanceOrderDetail projectMaintenanceOrderDetail = projectMaintenanceOrderDetailService.getById(repairOrder1.getProjectMaintenanceOrderId());
+// repairOrder1.setProjectMaintenanceOrderNum(projectMaintenanceOrderDetail.getTaskNum());
+// }
+//
+// String id = repairOrder1.getId();
+// QueryWrapper<RepairOrderActualWorkHours> wrapper = new QueryWrapper<>();
+// wrapper.eq("repair_order_id", id)
+// .eq("del_flag", 0);
+// wrapper.select("sum(actual_hour) as actualHour");
+// Map<String, Object> map = repairOrderActualWorkHoursService.getMap(wrapper);
+// BigDecimal actualHour = new BigDecimal(0);
+// if (map != null) {
+// actualHour = (BigDecimal) map.get("actualHour");
+// }
+// repairOrder1.setActualHour(actualHour);
+// }
return Result.OK(pageList);
}
--
Gitblit v1.9.3