From d000f6408f4baa0a0f87d4eda39bc8b9b543ed5b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 30 五月 2025 09:51:01 +0800
Subject: [PATCH] 设备管理后端修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 c0be5b7..c9cd930 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
@@ -161,8 +161,8 @@
// 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);
@@ -677,6 +677,11 @@
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
+ String equipmentId = maintenanceOrder.getEquipmentId();
+ Equipment equipment = equipmentService.getById(equipmentId);
+ equipment.setSecondMaintenanceTime(new Date());
+ equipmentService.updateById(equipment);
+
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
} else {
@@ -722,6 +727,20 @@
this.createMaintenanceStoveExempt(maintenanceOrder);
+ /**
+ * 涓変繚鎶ュ伐鏃� 鏇存柊鏈涓変繚鏃ユ湡 鍜屼笅娆′笁淇濇棩鏈�
+ */
+ String equipmentImportanceId = equipment.getEquipmentImportanceId();
+ equipment.setThirdMaintenanceTime(new Date());
+ if("A".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),3));
+ }else if("B".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
+ }else if("C".equals(equipmentImportanceId)){
+ equipment.setNextThirdMaintenanceTime(DateUtils.getYearAfter(new Date(),4));
+ }
+ equipmentService.updateById(equipment);
+
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
} else {
--
Gitblit v1.9.3