From c127accdddb76d11847f41b5685f5ef5e9e988d7 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期三, 13 三月 2024 09:14:42 +0800
Subject: [PATCH] 设备管理问题修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
index f1f3bd7..f3d82b7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java
@@ -158,12 +158,16 @@
             String id = (String) record.get("id");
             String equipmentId = (String) record.get("equipmentId");
             String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-            record.put("maintenanceCycles", maintenanceCycles);
+//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+//            record.put("maintenanceCycles", maintenanceCycles);
 
-            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
-            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
+//            List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
+//            record.put("dailyMaintenanceDetails", dailyMaintenanceDetails);
 
+            List<Map<String, Object>> operationUserDetails = dailyMaintenanceOrderService.getOperationUser(id);
+            record.put("operationUserDetails", operationUserDetails);
+            List<Map<String, Object>> repairUserDetails = dailyMaintenanceOrderService.getRepairUser(id);
+            record.put("repairUserDetails", repairUserDetails);
             //缁熻宸ユ椂瀹氶
 //            BigDecimal workingHourQuota = new BigDecimal(0);
 //            for(Map<String, Object> dailyMaintenanceOrderDetail : dailyMaintenanceDetails){
@@ -203,16 +207,20 @@
             for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
                 String operateUser = finishTransferOrder.getOperateUser();
 //                record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
-                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
+//                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
+                record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser));
                 String repairUser = finishTransferOrder.getRepairUser();
 //                record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
-                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
+//                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
+                record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser));
                 String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
 //                record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
-                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
+//                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
+                record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser));
                 String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
 //                record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
-                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
+//                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
+                record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser));
             }
 
         }
@@ -230,10 +238,10 @@
         List<Map<String, Object>> records = dailyMaintenanceOrderList.getRecords();
         for (Map<String, Object> record : records) {
             String id = (String) record.get("id");
-            String equipmentId = (String) record.get("equipmentId");
-            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
-            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
-            record.put("maintenanceCycles", maintenanceCycles);
+//            String equipmentId = (String) record.get("equipmentId");
+//            String maintenanceStandardId = (String) record.get("maintenanceStandardId");
+//            List<MaintenanceCycleVo> maintenanceCycles = dailyMaintenanceOrderService.getMaintenanceCycleByStandardId(maintenanceStandardId);
+//            record.put("maintenanceCycles", maintenanceCycles);
 
             List<Map<String, Object>> dailyMaintenanceDetails = dailyMaintenanceOrderService.getDailyMaintenanceDetailByOrderId(id);
             //缁熻宸ユ椂瀹氶
@@ -654,6 +662,7 @@
 
         List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
         for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
             dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
         }
 
@@ -685,6 +694,7 @@
 
         List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
         for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+            maintenanceOrderDetail.setMaintenanceOrderDetailUda1(dailyMaintenanceOrder.getMaintenanceUserId());
             dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
         }
 
@@ -778,10 +788,12 @@
         String orderId = dailyMaintenanceOrder.getId();
         String maintenanceOrderUda3 = dailyMaintenanceOrder.getMaintenanceOrderUda3();
         String confirmStatus = dailyMaintenanceOrder.getConfirmStatus();
+        Date maintenanceDate = dailyMaintenanceOrder.getMaintenanceDate();
 
         DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(orderId);
         String equipmentId = maintenanceOrder.getEquipmentId();
         String orderUda3 = maintenanceOrder.getMaintenanceOrderUda3();
+        maintenanceOrder.setMaintenanceDate(maintenanceDate);
         if(StringUtils.isBlank(orderUda3)){
             maintenanceOrder.setMaintenanceOrderUda3(maintenanceOrderUda3);
         }

--
Gitblit v1.9.3