From 1bf6cb4c0bfc149737afa37a1df1c809b29c6139 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 13:57:43 +0800
Subject: [PATCH] 点检测试修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 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..5b678e1 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);
@@ -306,17 +306,18 @@
Date planStartTime = dailyMaintenanceOrder.getPlanStartTime();
String maintenanceCycleId = dailyMaintenanceOrder.getMaintenanceCycleId();
MaintenanceCycle maintenanceCycle = maintenanceCycleService.getById(maintenanceCycleId);
- String unit = maintenanceCycle.getUnit();
- int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
- Date date = null;
- if ("min".equals(unit)) {
- date = DateUtils.getMinAfter(planStartTime, effectiveTime);
- } else if ("hour".equals(unit)) {
- date = DateUtils.getHourAfter(planStartTime, effectiveTime);
- } else if ("day".equals(unit)) {
- date = DateUtils.getDayAfter(planStartTime, effectiveTime);
- }
- dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
+// String unit = maintenanceCycle.getUnit();
+// int effectiveTime = maintenanceCycle.getEffectiveTime().intValue();
+// Date date = null;
+// if ("min".equals(unit)) {
+// date = DateUtils.getMinAfter(planStartTime, effectiveTime);
+// } else if ("hour".equals(unit)) {
+// date = DateUtils.getHourAfter(planStartTime, effectiveTime);
+// } else if ("day".equals(unit)) {
+// date = DateUtils.getDayAfter(planStartTime, effectiveTime);
+// }
+// dailyMaintenanceOrder.setPlanEndTime(date);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
+ dailyMaintenanceOrder.setPlanEndTime(null);//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setCreateType("1");//鍒涘缓绫诲瀷锛�1鎵嬪姩鍒涘缓锛�2鑷姩鍒涘缓锛�
dailyMaintenanceOrder.setConfirmStatus("0");//绉讳氦纭鐘舵�侊紙0鏈‘璁わ紝1涓讳换纭锛�2妫�楠屽憳纭锛�
dailyMaintenanceOrder.setPrecisionInspectionStatus("0");//绮惧害妫�楠屽崟娴佺▼鐘舵�侊紙0鏈‘璁わ紝1绮惧害妫�楠岃�咃紝2缁翠慨瀹や富浠伙紝3璁惧妫�楠屽憳锛�4浣跨敤鍗曚綅鎶�鏈富绠★紝5璁惧妫�楠屽憳锛堢洊绔狅級锛�
@@ -677,6 +678,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 +728,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