From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 f3d82b7..b00dc2f 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
@@ -381,7 +381,9 @@
* 鑻ユ灉鍘熸爣鍑嗗師鍛ㄦ湡鍙戠敓鍙樺寲锛屽垹闄ゅ師宸ュ崟鏄庣粏 閲嶆柊缁存姢
*/
if (!oldMaintenanceStandardId.equals(maintenanceStandardId) || !oldMaintenanceCycleId.equals(maintenanceCycleId)) {
- List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService.lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId).eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrderDetailService
+ .lambdaQuery().eq(DailyMaintenanceOrderDetail::getDailyMaintenanceOrderId, orderId)
+ .eq(DailyMaintenanceOrderDetail::getDelFlag, 0).list();
for (DailyMaintenanceOrderDetail dailyMaintenanceOrderDetail : dailyMaintenanceOrderDetails) {
dailyMaintenanceOrderDetailService.removeById(dailyMaintenanceOrderDetail);
}
@@ -675,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 {
@@ -720,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