From 286375a43369462cd75147271949cf819916912f Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 一月 2024 16:39:17 +0800
Subject: [PATCH] 问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 d36ced6..f1f3bd7 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
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -201,13 +202,17 @@
.eq(FinishTransferOrder::getEquipmentId, equipmentId).list();
for (FinishTransferOrder finishTransferOrder : finishTransferOrders) {
String operateUser = finishTransferOrder.getOperateUser();
- record.put("operateUserName", operateUser);
+// record.put("operateUserName", operateUser+"/"+finishTransferOrder.getTransferOrderUda1());
+ record.put("operateUserName",(StringUtils.isBlank(operateUser) ? "":operateUser+"/"+finishTransferOrder.getTransferOrderUda1()));
String repairUser = finishTransferOrder.getRepairUser();
- record.put("repairUserName", repairUser);
+// record.put("repairUserName", repairUser+"/"+finishTransferOrder.getTransferOrderUda2());
+ record.put("repairUserName",(StringUtils.isBlank(repairUser) ? "":repairUser+"/"+finishTransferOrder.getTransferOrderUda2()));
String repairDirectorUser = finishTransferOrder.getRepairDirectorUser();
- record.put("repairDirectorUserName", repairDirectorUser);
+// record.put("repairDirectorUserName", repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3());
+ record.put("repairDirectorUserName",(StringUtils.isBlank(repairDirectorUser) ? "":repairDirectorUser+"/"+finishTransferOrder.getTransferOrderUda3()));
String equipmentInspectorUser = finishTransferOrder.getEquipmentInspectorUser();
- record.put("equipmentInspectorUserName", equipmentInspectorUser);
+// record.put("equipmentInspectorUserName", equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4());
+ record.put("equipmentInspectorUserName",(StringUtils.isBlank(equipmentInspectorUser) ? "":equipmentInspectorUser+"/"+finishTransferOrder.getTransferOrderUda4()));
}
}
@@ -788,6 +793,7 @@
FinishTransferOrder finishTransferOrder = finishTransferOrders.get(0);
if("1".equals(confirmStatus)){
finishTransferOrder.setOperateUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda1(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -799,6 +805,7 @@
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
finishTransferOrder.setOperateUser("");
+ finishTransferOrder.setTransferOrderUda1("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -807,6 +814,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟搷浣滀汉鍛�",maintenanceOrder.getNum());
}else if("3".equals(confirmStatus)){
finishTransferOrder.setRepairUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda2(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -817,6 +825,7 @@
finishTransferOrder.setEquipmentInspectorUser("");
finishTransferOrder.setRepairDirectorUser("");
finishTransferOrder.setRepairUser("");
+ finishTransferOrder.setTransferOrderUda2("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -825,6 +834,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇汉鍛�",maintenanceOrder.getNum());
}else if("5".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda3(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -833,6 +843,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曟楠屽憳",maintenanceOrder.getNum());
}else if("6".equals(confirmStatus)){
finishTransferOrder.setRepairDirectorUser("");
+ finishTransferOrder.setTransferOrderUda3("");
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
@@ -841,6 +852,7 @@
this.twoMaintenanceAlert(confirmStatus,"浜屼繚绉讳氦鍗曠淮淇涓讳换",maintenanceOrder.getNum());
}else if("7".equals(confirmStatus)){
finishTransferOrder.setEquipmentInspectorUser(sysUser.getRealname());
+ finishTransferOrder.setTransferOrderUda4(DateUtils.now());
finishTransferOrderService.updateById(finishTransferOrder);
maintenanceOrder.setConfirmStatus(confirmStatus);
--
Gitblit v1.9.3