From 792ff6e14b5074d30f8a7bd804d3b8e6454c3969 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 11 一月 2024 17:41:45 +0800
Subject: [PATCH] 保养拆分
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 44d0d99..d36ced6 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
@@ -643,24 +643,23 @@
public Result<String> report(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
- dailyMaintenanceOrder.setMaintenanceUserId(userId);
+// dailyMaintenanceOrder.setMaintenanceUserId(userId);
dailyMaintenanceOrder.setActualEndTime(new Date());
boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
+ for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+ dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
+ }
String id = dailyMaintenanceOrder.getId();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
finishTransferOrder.setEquipmentId(maintenanceOrder.getEquipmentId());
finishTransferOrder.setMaintenanceOrderId(maintenanceOrder.getId());
-// finishTransferOrder.setOperateUser(userId);
-// finishTransferOrder.setRepairUser(userId);
finishTransferOrder.setStatus("1");
finishTransferOrder.setDelFlag(0);
finishTransferOrderService.save(finishTransferOrder);
-
-// this.createPrecisionInspection(maintenanceOrder);
-//
-// this.createMaintenanceStoveExempt(maintenanceOrder);
if (!b) {
return Result.error("鎶ュ伐澶辫触!");
@@ -675,10 +674,15 @@
public Result<String> report3M(@RequestBody DailyMaintenanceOrder dailyMaintenanceOrder) {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
String userId = sysUser.getId();
- dailyMaintenanceOrder.setMaintenanceUserId(userId);
+// dailyMaintenanceOrder.setMaintenanceUserId(userId);
dailyMaintenanceOrder.setActualEndTime(new Date());
boolean b = dailyMaintenanceOrderService.updateById(dailyMaintenanceOrder);
+ List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails = dailyMaintenanceOrder.getDailyMaintenanceOrderDetails();
+ for (DailyMaintenanceOrderDetail maintenanceOrderDetail : dailyMaintenanceOrderDetails) {
+ dailyMaintenanceOrderDetailService.updateById(maintenanceOrderDetail);
+ }
+
String id = dailyMaintenanceOrder.getId();
DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(id);
FinishTransferOrder finishTransferOrder = new FinishTransferOrder();
--
Gitblit v1.9.3